From 5ed02b58be9009f3f73eccf06d4d6d3567f132a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Sat, 2 Nov 2013 20:02:25 +0100 Subject: [PATCH] Info Panel size with variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch uses two variables to set the width and the height for the Info Panel. Now the panel has the same size than the window. Finally, this patch moves the center definition to the beginning, and removes the curly brackets. Signed-off-by: Rodolfo García Peñas (kix) --- src/dialog.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/dialog.c b/src/dialog.c index 3dcf31bf..5655cd50 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1123,17 +1123,19 @@ static void destroyInfoPanel(WCoreWindow *foo, void *data, XEvent *event) thePanel = NULL; } -void wShowInfoPanel(WScreen * scr) +void wShowInfoPanel(WScreen *scr) { + const int win_width = 382; + const int win_height = 230; InfoPanel *panel; WMPixmap *logo; WMFont *font; - char *strbuf = NULL; + char *name, *strbuf = NULL; const char *separator; char buffer[256]; - const char *name; Window parent; WWindow *wwin; + WMPoint center; char **strl; int i, width = 50, sepHeight; char *visuals[] = { @@ -1158,7 +1160,7 @@ void wShowInfoPanel(WScreen * scr) panel->scr = scr; panel->win = WMCreateWindow(scr->wmscreen, "info"); - WMResizeWidget(panel->win, 390, 230); + WMResizeWidget(panel->win, win_width, win_height); logo = WMCreateApplicationIconBlendedPixmap(scr->wmscreen, (RColor *) NULL); if (!logo) { @@ -1329,17 +1331,14 @@ void wShowInfoPanel(WScreen * scr) WMRealizeWidget(panel->win); WMMapSubwidgets(panel->win); - parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 382, 230, 0, 0, 0); + parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, win_width, win_height, 0, 0, 0); XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0); WMMapWidget(panel->win); - { - WMPoint center = getCenter(scr, 382, 230); - - wwin = wManageInternalWindow(scr, parent, None, _("Info"), center.x, center.y, 382, 230); - } + center = getCenter(scr, win_width, win_height); + wwin = wManageInternalWindow(scr, parent, None, _("Info"), center.x, center.y, win_width, win_height); WSETUFLAG(wwin, no_closable, 0); WSETUFLAG(wwin, no_close_button, 0);