From c929b4afa0049f43fd31927680303d3516f6e84f Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Sun, 7 Nov 2010 17:43:14 +0000 Subject: [PATCH] launcher : fixed icon position --- src/launcher/launcher.c | 8 +++----- src/launcher/xsettings-client.c | 21 +++++++-------------- src/systray/systraybar.c | 6 +++--- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 0cb9fc8..cf9e136 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -199,10 +199,7 @@ int resize_launcher(void *obj) } } - count = 0; - for (l = launcher->list_icons; l ; l = l->next) { - count++; - } + count = g_slist_length(launcher->list_icons); if (panel_horizontal) { if (!count) launcher->area.width = 0; @@ -228,7 +225,7 @@ int resize_launcher(void *obj) } int i, posx, posy; - int start = launcher->area.bg->border.width + launcher->area.paddingy;// +marging/2; + int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2; if (panel_horizontal) { posy = start; posx = launcher->area.bg->border.width + launcher->area.paddingxlr; @@ -243,6 +240,7 @@ int resize_launcher(void *obj) launcherIcon->y = posy; launcherIcon->x = posx; + //printf("launcher %d : %d,%d\n", i, posx, posy); if (panel_horizontal) { if (i % icons_per_column) posy += icon_size + launcher->area.paddingx; diff --git a/src/launcher/xsettings-client.c b/src/launcher/xsettings-client.c index be569e6..e888dc9 100644 --- a/src/launcher/xsettings-client.c +++ b/src/launcher/xsettings-client.c @@ -412,25 +412,18 @@ XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNo client->manager_window = None; client->settings = NULL; - XGrabServer (server.dsp); - client->manager_window = XGetSelectionOwner (server.dsp, server.atom._XSETTINGS_SCREEN); - if (client->manager_window != None) - XSelectInput (server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask); - XUngrabServer (client->display); - XFlush (client->display); - - if (client->manager_window == None) { - printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n"); - free (client); - return NULL; - } - if (client->watch) client->watch (RootWindow (display, screen), True, StructureNotifyMask, client->cb_data); check_manager_window (client); - return client; + if (client->manager_window == None) { + printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n"); + free (client); + return NULL; + } + else + return client; } diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index abf633e..c2f437e 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -167,11 +167,10 @@ int resize_systray(void *obj) void on_change_systray (void *obj) { - // here, sysbar's position is defined. so we can calculate position of tray icon. + // here, systray.area.posx/posy are defined by rendering engine. so we can calculate position of tray icon. Systraybar *sysbar = obj; - Panel *panel = sysbar->area.panel; int i, posx, posy; - int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +sysbar->marging/2; + int start = systray.area.posy + systray.area.bg->border.width + systray.area.paddingy + sysbar->marging/2; if (panel_horizontal) { posy = start; posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr; @@ -189,6 +188,7 @@ void on_change_systray (void *obj) traywin->y = posy; traywin->x = posx; + //printf("systray %d : %d,%d\n", i, posx, posy); traywin->width = sysbar->icon_size; traywin->height = sysbar->icon_size; if (panel_horizontal) { -- 2.45.2