gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-23 06:38:05 +01:00
Code Issues Projects Releases Wiki Activity

Legal Panel size with variables

Browse Source 
This patch uses two variables to set the width and the height for the
Info Panel. It also includes a margin space.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
This commit is contained in:
Rodolfo García Peñas (kix)
2013-11-02 20:02:27 +01:00
committed by Carlos R. Mafra
parent 415ac91afc
commit 246068a634
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/dialog.c
View File

@@ -1364,11 +1364,8 @@ void wShowInfoPanel(WScreen *scr)
typedef struct { typedef struct {
WScreen *scr; WScreen *scr;
WWindow *wwin; WWindow *wwin;
WMWindow *win; WMWindow *win;
WMLabel *licenseL; WMLabel *licenseL;
} LegalPanel; } LegalPanel;
@@ -1382,21 +1379,21 @@ static void destroyLegalPanel(WCoreWindow * foo, void *data, XEvent * event)
(void) event; (void) event;
WMUnmapWidget(legalPanel->win); WMUnmapWidget(legalPanel->win);
WMDestroyWidget(legalPanel->win); WMDestroyWidget(legalPanel->win);
wUnmanageWindow(legalPanel->wwin, False, False); wUnmanageWindow(legalPanel->wwin, False, False);
wfree(legalPanel); wfree(legalPanel);
legalPanel = NULL; legalPanel = NULL;
} }
void wShowLegalPanel(WScreen * scr) void wShowLegalPanel(WScreen *scr)
{ {
const int win_width = 420;
const int win_height = 250;
const int margin = 10;
LegalPanel *panel; LegalPanel *panel;
Window parent; Window parent;
WWindow *wwin; WWindow *wwin;
WMPoint center;
if (legalPanel) { if (legalPanel) {
if (legalPanel->scr == scr) { if (legalPanel->scr == scr) {
@@ -1407,16 +1404,14 @@ void wShowLegalPanel(WScreen * scr)
} }
panel = wmalloc(sizeof(LegalPanel)); panel = wmalloc(sizeof(LegalPanel));
panel->scr = scr; panel->scr = scr;
panel->win = WMCreateWindow(scr->wmscreen, "legal"); panel->win = WMCreateWindow(scr->wmscreen, "legal");
WMResizeWidget(panel->win, 420, 250); WMResizeWidget(panel->win, win_width, win_height);
panel->licenseL = WMCreateLabel(panel->win); panel->licenseL = WMCreateLabel(panel->win);
WMSetLabelWraps(panel->licenseL, True); WMSetLabelWraps(panel->licenseL, True);
WMResizeWidget(panel->licenseL, 400, 230); WMResizeWidget(panel->licenseL, win_width - (2 * margin), win_height - (2 * margin));
WMMoveWidget(panel->licenseL, 10, 10); WMMoveWidget(panel->licenseL, margin, margin);
WMSetLabelTextAlignment(panel->licenseL, WALeft); WMSetLabelTextAlignment(panel->licenseL, WALeft);
WMSetLabelText(panel->licenseL, WMSetLabelText(panel->licenseL,
_(" Window Maker is free software; you can redistribute it and/or " _(" Window Maker is free software; you can redistribute it and/or "
@@ -1436,15 +1431,10 @@ void wShowLegalPanel(WScreen * scr)
WMRealizeWidget(panel->win); WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win); WMMapSubwidgets(panel->win);
parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 420, 250, 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); XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0);
center = getCenter(scr, win_width, win_height);
{ wwin = wManageInternalWindow(scr, parent, None, _("Legal"), center.x, center.y, win_width, win_height);
WMPoint center = getCenter(scr, 420, 250);
wwin = wManageInternalWindow(scr, parent, None, _("Legal"), center.x, center.y, 420, 250);
}
WSETUFLAG(wwin, no_closable, 0); WSETUFLAG(wwin, no_closable, 0);
WSETUFLAG(wwin, no_close_button, 0); WSETUFLAG(wwin, no_close_button, 0);
@@ -1454,13 +1444,10 @@ void wShowLegalPanel(WScreen * scr)
wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON); wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON);
#endif #endif
wwin->frame->on_click_right = destroyLegalPanel; wwin->frame->on_click_right = destroyLegalPanel;
panel->wwin = wwin; panel->wwin = wwin;
WMMapWidget(panel->win); WMMapWidget(panel->win);
wWindowMap(wwin); wWindowMap(wwin);
legalPanel = panel; legalPanel = panel;
} }