From d583c533c2bc32b44dd940e0251117ce167cc19e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 12 Sep 2018 18:29:06 +0530 Subject: [PATCH] Linux: Fix window icon not set on X11 for the first OS window Fix #961 --- docs/changelog.rst | 2 ++ kitty/main.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 6ba2d2d52..c98ebe2e2 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -51,6 +51,8 @@ Changelog - macOS: Fix resizing semi-transparent windows causing the windows to be invisible during the resize (:iss:`941`) +- Linux: Fix window icon not set on X11 for the first OS window (:iss:`961`) + 0.12.1 [2018-09-08] ------------------------------ diff --git a/kitty/main.py b/kitty/main.py index baa3a7b45..a619f86fe 100644 --- a/kitty/main.py +++ b/kitty/main.py @@ -125,6 +125,9 @@ def _run_app(opts, args): # on dual GPU machines: https://github.com/kovidgoyal/kitty/issues/794 set_custom_ibeam_cursor() load_all_shaders.cursor_text_color = opts.cursor_text_color + if not is_wayland and not is_macos: # no window icons on wayland + with open(logo_data_file, 'rb') as f: + set_default_window_icon(f.read(), 256, 256) with cached_values_for(run_app.cached_values_name) as cached_values: with startup_notification_handler(extra_callback=run_app.first_window_callback) as pre_show_callback: window_id = create_os_window( @@ -132,9 +135,6 @@ def _run_app(opts, args): pre_show_callback, appname, args.name or args.cls or appname, args.cls or appname, load_all_shaders) - if not is_wayland and not is_macos: # no window icons on wayland - with open(logo_data_file, 'rb') as f: - set_default_window_icon(f.read(), 256, 256) boss = Boss(window_id, opts, args, cached_values, new_os_window_trigger) boss.start() try: