nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

systray: reorder some operations to make sure we resize correctly

Browse source
This commit is contained in:
o9000 2015-06-12 11:57:05 +02:00
parent ae379d865c
commit b4ff007e42
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/systray/systraybar.c
View file

@ -441,19 +441,6 @@ gboolean add_icon(Window win)
} }
Window parent = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr); Window parent = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr);
// Watch for the icon trying to resize itself / closing again
XSync(server.dsp, False);
error = FALSE;
XErrorHandler old = XSetErrorHandler(window_error_handler);
XSelectInput(server.dsp, win, StructureNotifyMask);
XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
fprintf(stderr, "tint2 : cannot add systray icon\n");
XDestroyWindow(server.dsp, parent);
return FALSE;
}
// Add the icon to the list // Add the icon to the list
traywin = g_new0(TrayWindow, 1); traywin = g_new0(TrayWindow, 1);
traywin->parent = parent; traywin->parent = parent;
@ -482,6 +469,7 @@ gboolean add_icon(Window win)
// Resize and redraw the systray // Resize and redraw the systray
systray.area.resize = 1; systray.area.resize = 1;
systray.area.redraw = 1; systray.area.redraw = 1;
panel->area.resize = 1;
panel_refresh = 1; panel_refresh = 1;
return TRUE; return TRUE;
} }
@ -506,8 +494,18 @@ gboolean reparent_icon(TrayWindow *traywin)
return FALSE; return FALSE;
} }
XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height); // Watch for the icon trying to resize itself / closing again
XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height); XSync(server.dsp, False);
error = FALSE;
old = XSetErrorHandler(window_error_handler);
XSelectInput(server.dsp, traywin->win, StructureNotifyMask);
XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
printf("systray %d: cannot embed icon for window %lu parent %lu pid %d\n", __LINE__, traywin->win, traywin->parent, traywin->pid);
remove_icon(traywin);
return FALSE;
}
traywin->reparented = 1; traywin->reparented = 1;
@ -574,6 +572,11 @@ gboolean reparent_icon(TrayWindow *traywin)
if (!traywin->hide && !panel->is_hidden) if (!traywin->hide && !panel->is_hidden)
XMapRaised(server.dsp, traywin->parent); XMapRaised(server.dsp, traywin->parent);
XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height);
XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);
XFlush(server.dsp);
return TRUE; return TRUE;
} }