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

Renamed the ScaleX/Y macros and their local variables

Browse Source 
The names of the macros and the local variables that they use
have been changed to make them less "user-space" like.

    ScaleX -> WMScaleX
    ScaleY -> WMScaleY
    fw     -> wmScaleWidth
    fh     -> wmScaleHeight
This commit is contained in:
Tim Taenny
2019-06-18 21:17:30 +02:00
committed by Carlos R. Mafra
parent 1e490f8233
commit 5ab9b7c6be
4 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WINGs/WINGs/WUtil.h
View File

@@ -197,12 +197,12 @@ typedef void WMNotificationObserverAction(void *observerData,
* the panel layouts so that they match the configured size of the system
* font (useful with high DPI screens, where you have to increase this size).
* The macros require two local variables to be set:
* fw: the width of the alphabet in the current system font
* fh: the height of the current system font
* wmScaleWidth: the width of the alphabet in the current system font
* wmScaleHeight: the height of the current system font
* Use the WMGetScaleBaseFromSystemFont function to set these values.
*/
#define ScaleX(value) ((int)((double)value / 177.0 * (double)fw + 0.5))
#define ScaleY(value) ((int)((double)value / 15.0 * (double)fh + 0.5))
#define WMScaleX(value) ((int)((double)value / 177.0 * (double)wmScaleWidth + 0.5))
#define WMScaleY(value) ((int)((double)value / 15.0 * (double)wmScaleHeight + 0.5))
/* ---[ WINGs/memory.c ]-------------------------------------------------- */

88
WINGs/wpanel.c
View File

@@ -246,7 +246,7 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
int dw = 0, aw = 0, ow = 0, w;
WMBox *hbox;
WMPixmap *icon;
int fw, fh;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
panel = wmalloc(sizeof(WMAlertPanel));
@@ -258,16 +258,16 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
}
/* calculate and set the panel's size */
WMGetScaleBaseFromSystemFont(scrPtr, &fw, &fh);
pwidth = ScaleX(400);
pheight = ScaleY(5) /* upper margin */
+ 64 /* icon size */
+ ScaleY(5) /* space between icon and divider line */
+ 2 /* divider line */
+ ScaleY(5); /* space between divider line and message */
WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
pwidth = WMScaleX(400);
pheight = WMScaleY(5) /* upper margin */
+ 64 /* icon size */
+ WMScaleY(5) /* space between icon and divider line */
+ 2 /* divider line */
+ WMScaleY(5); /* space between divider line and message */
if (msg)
pheight += WMFontHeight(scrPtr->normalFont) * 4 + ScaleY(5);
pheight += ScaleY(44);
pheight += WMFontHeight(scrPtr->normalFont) * 4 + WMScaleY(5);
pheight += WMScaleY(44);
WMResizeWidget(panel->win, pwidth, pheight);
WMSetWindowInitialPosition(panel->win,
@@ -282,10 +282,10 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
WMMapWidget(panel->vbox);
hbox = WMCreateBox(panel->vbox);
WMSetBoxBorderWidth(hbox, ScaleX(5));
WMSetBoxBorderWidth(hbox, WMScaleX(5));
WMSetBoxHorizontal(hbox, True);
WMMapWidget(hbox);
WMAddBoxSubview(panel->vbox, WMWidgetView(hbox), False, True, 64 + 2 * ScaleY(5), 0, ScaleY(5));
WMAddBoxSubview(panel->vbox, WMWidgetView(hbox), False, True, 64 + 2 * WMScaleY(5), 0, WMScaleY(5));
panel->iLbl = WMCreateLabel(hbox);
WMSetLabelImagePosition(panel->iLbl, WIPImageOnly);
@@ -318,7 +318,7 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
panel->line = WMCreateFrame(panel->win);
WMMapWidget(panel->line);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->line), False, True, 2, 2, ScaleY(5));
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->line), False, True, 2, 2, WMScaleY(5));
WMSetFrameRelief(panel->line, WRGroove);
if (msg) {
@@ -326,16 +326,16 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
WMSetLabelWraps(panel->mLbl, True);
WMMapWidget(panel->mLbl);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->mLbl), True, True,
WMFontHeight(scrPtr->normalFont) * 4, 0, ScaleY(5));
WMFontHeight(scrPtr->normalFont) * 4, 0, WMScaleY(5));
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WACenter);
}
panel->hbox = WMCreateBox(panel->vbox);
WMSetBoxBorderWidth(panel->hbox, ScaleX(10));
WMSetBoxBorderWidth(panel->hbox, WMScaleX(10));
WMSetBoxHorizontal(panel->hbox, True);
WMMapWidget(panel->hbox);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->hbox), False, True, ScaleY(44), 0, 0);
WMAddBoxSubview(panel->vbox, WMWidgetView(panel->hbox), False, True, WMScaleY(44), 0, 0);
/* create buttons */
if (otherButton)
@@ -349,19 +349,19 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
aw += ScaleX(30);
ow += ScaleX(30);
dw += ScaleX(30);
aw += WMScaleX(30);
ow += WMScaleX(30);
dw += WMScaleX(30);
w = WMAX(dw, WMAX(aw, ow));
if ((w + ScaleX(10)) * 3 < pwidth) {
if ((w + WMScaleX(10)) * 3 < pwidth) {
aw = w;
ow = w;
dw = w;
} else {
int t;
t = pwidth - 4 * ScaleX(10) - aw - ow - dw;
t = pwidth - 4 * WMScaleX(10) - aw - ow - dw;
aw += t / 3;
ow += t / 3;
dw += t / 3;
@@ -369,7 +369,7 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
if (defaultButton) {
panel->defBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->defBtn, dw, ScaleY(24));
WMResizeWidget(panel->defBtn, dw, WMScaleY(24));
WMSetButtonAction(panel->defBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->defBtn), False, True, dw, 0, 0);
WMSetButtonText(panel->defBtn, defaultButton);
@@ -379,16 +379,16 @@ WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
}
if (alternateButton) {
panel->altBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->altBtn, aw, ScaleY(24));
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, ScaleX(5));
WMResizeWidget(panel->altBtn, aw, WMScaleY(24));
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, WMScaleX(5));
WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
WMSetButtonText(panel->altBtn, alternateButton);
}
if (otherButton) {
panel->othBtn = WMCreateCommandButton(panel->hbox);
WMResizeWidget(panel->othBtn, ow, ScaleY(24));
WMResizeWidget(panel->othBtn, ow, WMScaleY(24));
WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, ScaleX(5));
WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, WMScaleX(5));
WMSetButtonText(panel->othBtn, otherButton);
}
@@ -612,7 +612,7 @@ WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, cons
{
WMInputPanel *panel;
int x, dw = 0, aw = 0, w;
int fw, fh;
int wmScaleWidth, wmScaleHeight;
panel = wmalloc(sizeof(WMInputPanel));
@@ -622,17 +622,17 @@ WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, cons
panel->win = WMCreateWindowWithStyle(scrPtr, "inputPanel", WMTitledWindowMask);
WMSetWindowTitle(panel->win, "");
WMGetScaleBaseFromSystemFont(scrPtr, &fw, &fh);
WMResizeWidget(panel->win, ScaleX(320), ScaleY(160));
WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
WMResizeWidget(panel->win, WMScaleX(320), WMScaleY(160));
if (title) {
WMFont *largeFont;
largeFont = WMBoldSystemFontOfSize(scrPtr, ScaleY(24));
largeFont = WMBoldSystemFontOfSize(scrPtr, WMScaleY(24));
panel->tLbl = WMCreateLabel(panel->win);
WMMoveWidget(panel->tLbl, ScaleX(20), ScaleY(16));
WMResizeWidget(panel->tLbl, ScaleX(320) - 2 * ScaleX(20), WMFontHeight(largeFont) + ScaleY(4));
WMMoveWidget(panel->tLbl, WMScaleX(20), WMScaleY(16));
WMResizeWidget(panel->tLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(largeFont) + WMScaleY(4));
WMSetLabelText(panel->tLbl, title);
WMSetLabelTextAlignment(panel->tLbl, WALeft);
WMSetLabelFont(panel->tLbl, largeFont);
@@ -642,15 +642,15 @@ WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, cons
if (msg) {
panel->mLbl = WMCreateLabel(panel->win);
WMMoveWidget(panel->mLbl, ScaleX(20), ScaleY(50));
WMResizeWidget(panel->mLbl, ScaleX(320) - 2 * ScaleX(20), WMFontHeight(scrPtr->normalFont) * 2);
WMMoveWidget(panel->mLbl, WMScaleX(20), WMScaleY(50));
WMResizeWidget(panel->mLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(scrPtr->normalFont) * 2);
WMSetLabelText(panel->mLbl, msg);
WMSetLabelTextAlignment(panel->mLbl, WALeft);
}
panel->text = WMCreateTextField(panel->win);
WMMoveWidget(panel->text, ScaleX(20), ScaleY(85));
WMResizeWidget(panel->text, ScaleX(320) - 2 * ScaleX(20), ScaleY(20));
WMMoveWidget(panel->text, WMScaleX(20), WMScaleY(85));
WMResizeWidget(panel->text, WMScaleX(320) - 2 * WMScaleX(20), WMScaleY(20));
WMSetTextFieldText(panel->text, defaultText);
WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
@@ -666,29 +666,29 @@ WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, cons
if (aw > w)
w = aw;
w += ScaleX(30);
x = ScaleX(310);
w += WMScaleX(30);
x = WMScaleX(310);
if (okButton) {
x -= w + ScaleX(10);
x -= w + WMScaleX(10);
panel->defBtn = WMCreateCustomButton(panel->win, WBBPushInMask
| WBBPushChangeMask | WBBPushLightMask);
WMSetButtonAction(panel->defBtn, inputBoxOnClick, panel);
WMMoveWidget(panel->defBtn, x, ScaleY(124));
WMResizeWidget(panel->defBtn, w, ScaleY(24));
WMMoveWidget(panel->defBtn, x, WMScaleY(124));
WMResizeWidget(panel->defBtn, w, WMScaleY(24));
WMSetButtonText(panel->defBtn, okButton);
WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
WMSetButtonImagePosition(panel->defBtn, WIPRight);
}
if (cancelButton) {
x -= w + ScaleX(10);
x -= w + WMScaleX(10);
panel->altBtn = WMCreateCommandButton(panel->win);
WMSetButtonAction(panel->altBtn, inputBoxOnClick, panel);
WMMoveWidget(panel->altBtn, x, ScaleY(124));
WMResizeWidget(panel->altBtn, w, ScaleY(24));
WMMoveWidget(panel->altBtn, x, WMScaleY(124));
WMResizeWidget(panel->altBtn, w, WMScaleY(24));
WMSetButtonText(panel->altBtn, cancelButton);
}

116
src/dialog.c
View File

@@ -924,7 +924,7 @@ Bool wIconChooserDialog(WScreen *scr, char **file, const char *instance, const c
WMColor *color;
WMFont *boldFont;
Bool result;
int fw, fh;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
panel = wmalloc(sizeof(IconPanel));
@@ -932,19 +932,19 @@ Bool wIconChooserDialog(WScreen *scr, char **file, const char *instance, const c
panel->scr = scr;
panel->win = WMCreateWindow(scr->wmscreen, "iconChooser");
WMGetScaleBaseFromSystemFont(scr->wmscreen, &fw, &fh);
pwidth = ScaleX(450);
pheight = ScaleY(280);
WMGetScaleBaseFromSystemFont(scr->wmscreen, &wmScaleWidth, &wmScaleHeight);
pwidth = WMScaleX(450);
pheight = WMScaleY(280);
WMResizeWidget(panel->win, pwidth, pheight);
WMCreateEventHandler(WMWidgetView(panel->win), KeyPressMask | KeyReleaseMask, keyPressHandler, panel);
boldFont = WMBoldSystemFontOfSize(scr->wmscreen, ScaleY(12));
panel->normalfont = WMSystemFontOfSize(WMWidgetScreen(panel->win), ScaleY(12));
boldFont = WMBoldSystemFontOfSize(scr->wmscreen, WMScaleY(12));
panel->normalfont = WMSystemFontOfSize(WMWidgetScreen(panel->win), WMScaleY(12));
panel->dirLabel = WMCreateLabel(panel->win);
WMResizeWidget(panel->dirLabel, ScaleX(200), ScaleY(20));
WMMoveWidget(panel->dirLabel, ScaleX(10), ScaleY(7));
WMResizeWidget(panel->dirLabel, WMScaleX(200), WMScaleY(20));
WMMoveWidget(panel->dirLabel, WMScaleX(10), WMScaleY(7));
WMSetLabelText(panel->dirLabel, _("Directories"));
WMSetLabelFont(panel->dirLabel, boldFont);
WMSetLabelTextAlignment(panel->dirLabel, WACenter);
@@ -952,8 +952,8 @@ Bool wIconChooserDialog(WScreen *scr, char **file, const char *instance, const c
WMSetLabelRelief(panel->dirLabel, WRSunken);
panel->iconLabel = WMCreateLabel(panel->win);
WMResizeWidget(panel->iconLabel, ScaleX(140), ScaleY(20));
WMMoveWidget(panel->iconLabel, ScaleX(215), ScaleY(7));
WMResizeWidget(panel->iconLabel, WMScaleX(140), WMScaleY(20));
WMMoveWidget(panel->iconLabel, WMScaleX(215), WMScaleY(7));
WMSetLabelText(panel->iconLabel, _("Icons"));
WMSetLabelFont(panel->iconLabel, boldFont);
WMSetLabelTextAlignment(panel->iconLabel, WACenter);
@@ -973,57 +973,57 @@ Bool wIconChooserDialog(WScreen *scr, char **file, const char *instance, const c
WMSetLabelRelief(panel->iconLabel, WRSunken);
panel->dirList = WMCreateList(panel->win);
WMResizeWidget(panel->dirList, ScaleX(200), ScaleY(170));
WMMoveWidget(panel->dirList, ScaleX(10), ScaleY(30));
WMResizeWidget(panel->dirList, WMScaleX(200), WMScaleY(170));
WMMoveWidget(panel->dirList, WMScaleX(10), WMScaleY(30));
WMSetListAction(panel->dirList, listCallback, panel);
panel->iconList = WMCreateList(panel->win);
WMResizeWidget(panel->iconList, ScaleX(140), ScaleY(170));
WMMoveWidget(panel->iconList, ScaleX(215), ScaleY(30));
WMResizeWidget(panel->iconList, WMScaleX(140), WMScaleY(170));
WMMoveWidget(panel->iconList, WMScaleX(215), WMScaleY(30));
WMSetListAction(panel->iconList, listCallback, panel);
WMHangData(panel->iconList, panel);
panel->previewButton = WMCreateCommandButton(panel->win);
WMResizeWidget(panel->previewButton, ScaleX(75), ScaleY(26));
WMMoveWidget(panel->previewButton, ScaleX(365), ScaleY(130));
WMResizeWidget(panel->previewButton, WMScaleX(75), WMScaleY(26));
WMMoveWidget(panel->previewButton, WMScaleX(365), WMScaleY(130));
WMSetButtonText(panel->previewButton, _("Preview"));
WMSetButtonAction(panel->previewButton, buttonCallback, panel);
panel->iconView = WMCreateLabel(panel->win);
WMResizeWidget(panel->iconView, ScaleX(75), ScaleY(75));
WMMoveWidget(panel->iconView, ScaleX(365), ScaleY(40));
WMResizeWidget(panel->iconView, WMScaleX(75), WMScaleY(75));
WMMoveWidget(panel->iconView, WMScaleX(365), WMScaleY(40));
WMSetLabelImagePosition(panel->iconView, WIPOverlaps);
WMSetLabelRelief(panel->iconView, WRSunken);
WMSetLabelTextAlignment(panel->iconView, WACenter);
panel->fileLabel = WMCreateLabel(panel->win);
WMResizeWidget(panel->fileLabel, ScaleX(80), ScaleY(20));
WMMoveWidget(panel->fileLabel, ScaleX(10), ScaleY(210));
WMResizeWidget(panel->fileLabel, WMScaleX(80), WMScaleY(20));
WMMoveWidget(panel->fileLabel, WMScaleX(10), WMScaleY(210));
WMSetLabelText(panel->fileLabel, _("File Name:"));
panel->fileField = WMCreateTextField(panel->win);
WMSetViewNextResponder(WMWidgetView(panel->fileField), WMWidgetView(panel->win));
WMResizeWidget(panel->fileField, ScaleX(345), ScaleY(20));
WMMoveWidget(panel->fileField, ScaleX(95), ScaleY(210));
WMResizeWidget(panel->fileField, WMScaleX(345), WMScaleY(20));
WMMoveWidget(panel->fileField, WMScaleX(95), WMScaleY(210));
WMSetTextFieldEditable(panel->fileField, False);
panel->okButton = WMCreateCommandButton(panel->win);
WMResizeWidget(panel->okButton, ScaleX(80), ScaleY(26));
WMMoveWidget(panel->okButton, ScaleX(360), ScaleY(242));
WMResizeWidget(panel->okButton, WMScaleX(80), WMScaleY(26));
WMMoveWidget(panel->okButton, WMScaleX(360), WMScaleY(242));
WMSetButtonText(panel->okButton, _("OK"));
WMSetButtonEnabled(panel->okButton, False);
WMSetButtonAction(panel->okButton, buttonCallback, panel);
panel->cancelButton = WMCreateCommandButton(panel->win);
WMResizeWidget(panel->cancelButton, ScaleX(80), ScaleY(26));
WMMoveWidget(panel->cancelButton, ScaleX(270), ScaleY(242));
WMResizeWidget(panel->cancelButton, WMScaleX(80), WMScaleY(26));
WMMoveWidget(panel->cancelButton, WMScaleX(270), WMScaleY(242));
WMSetButtonText(panel->cancelButton, _("Cancel"));
WMSetButtonAction(panel->cancelButton, buttonCallback, panel);
#if 0
panel->chooseButton = WMCreateCommandButton(panel->win);
WMResizeWidget(panel->chooseButton, ScaleX(110), ScaleY(26));
WMMoveWidget(panel->chooseButton, ScaleX(150), ScaleY(242));
WMResizeWidget(panel->chooseButton, WMScaleX(110), WMScaleY(26));
WMMoveWidget(panel->chooseButton, WMScaleX(150), WMScaleY(242));
WMSetButtonText(panel->chooseButton, _("Choose File"));
WMSetButtonAction(panel->chooseButton, buttonCallback, panel);
#endif
@@ -1188,7 +1188,7 @@ void wShowInfoPanel(WScreen *scr)
"TrueColor",
"DirectColor"
};
int fw, fh;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
if (infoPanel) {
@@ -1204,9 +1204,9 @@ void wShowInfoPanel(WScreen *scr)
panel->scr = scr;
panel->win = WMCreateWindow(scr->wmscreen, "info");
WMGetScaleBaseFromSystemFont(scr->wmscreen, &fw, &fh);
pwidth = ScaleX(382);
pheight = ScaleY(250);
WMGetScaleBaseFromSystemFont(scr->wmscreen, &wmScaleWidth, &wmScaleHeight);
pwidth = WMScaleX(382);
pheight = WMScaleY(250);
WMResizeWidget(panel->win, pwidth, pheight);
logo = WMCreateApplicationIconBlendedPixmap(scr->wmscreen, (RColor *) NULL);
@@ -1215,22 +1215,22 @@ void wShowInfoPanel(WScreen *scr)
}
if (logo) {
panel->logoL = WMCreateLabel(panel->win);
WMResizeWidget(panel->logoL, ScaleX(64), ScaleY(64));
WMMoveWidget(panel->logoL, ScaleX(30), ScaleY(20));
WMResizeWidget(panel->logoL, WMScaleX(64), WMScaleY(64));
WMMoveWidget(panel->logoL, WMScaleX(30), WMScaleY(20));
WMSetLabelImagePosition(panel->logoL, WIPImageOnly);
WMSetLabelImage(panel->logoL, logo);
WMReleasePixmap(logo);
}
sepHeight = ScaleY(3);
sepHeight = WMScaleY(3);
panel->name1L = WMCreateLabel(panel->win);
WMResizeWidget(panel->name1L, ScaleX(240), ScaleY(30) + ScaleY(2));
WMMoveWidget(panel->name1L, ScaleX(100), ScaleY(30) - ScaleY(2) - sepHeight);
WMResizeWidget(panel->name1L, WMScaleX(240), WMScaleY(30) + WMScaleY(2));
WMMoveWidget(panel->name1L, WMScaleX(100), WMScaleY(30) - WMScaleY(2) - sepHeight);
snprintf(buffer,
sizeof(buffer),
"Lucida Sans,Comic Sans MS,URW Gothic L,Trebuchet MS:italic:pixelsize=%d:antialias=true",
ScaleY(24));
WMScaleY(24));
font = WMCreateFont(scr->wmscreen, buffer);
strbuf = "Window Maker";
if (font) {
@@ -1243,14 +1243,14 @@ void wShowInfoPanel(WScreen *scr)
panel->lineF = WMCreateFrame(panel->win);
WMResizeWidget(panel->lineF, width, sepHeight);
WMMoveWidget(panel->lineF, ScaleX(100) + (ScaleX(240) - width) / 2, ScaleY(60) - sepHeight);
WMMoveWidget(panel->lineF, WMScaleX(100) + (WMScaleX(240) - width) / 2, WMScaleY(60) - sepHeight);
WMSetFrameRelief(panel->lineF, WRSimple);
WMSetWidgetBackgroundColor(panel->lineF, scr->black);
panel->name2L = WMCreateLabel(panel->win);
WMResizeWidget(panel->name2L, ScaleX(240), ScaleY(24));
WMMoveWidget(panel->name2L, ScaleX(100), ScaleY(60));
snprintf(buffer, sizeof(buffer), "URW Gothic L,Nimbus Sans L:pixelsize=%d:antialias=true", ScaleY(16));
WMResizeWidget(panel->name2L, WMScaleX(240), WMScaleY(24));
WMMoveWidget(panel->name2L, WMScaleX(100), WMScaleY(60));
snprintf(buffer, sizeof(buffer), "URW Gothic L,Nimbus Sans L:pixelsize=%d:antialias=true", WMScaleY(16));
font = WMCreateFont(scr->wmscreen, buffer);
if (font) {
WMSetLabelFont(panel->name2L, font);
@@ -1262,18 +1262,18 @@ void wShowInfoPanel(WScreen *scr)
snprintf(buffer, sizeof(buffer), _("Version %s"), VERSION);
panel->versionL = WMCreateLabel(panel->win);
WMResizeWidget(panel->versionL, ScaleX(310), ScaleY(16));
WMMoveWidget(panel->versionL, ScaleX(30), ScaleY(95));
WMResizeWidget(panel->versionL, WMScaleX(310), WMScaleY(16));
WMMoveWidget(panel->versionL, WMScaleX(30), WMScaleY(95));
WMSetLabelTextAlignment(panel->versionL, WARight);
WMSetLabelText(panel->versionL, buffer);
WMSetLabelWraps(panel->versionL, False);
panel->copyrL = WMCreateLabel(panel->win);
WMResizeWidget(panel->copyrL, ScaleX(360), ScaleY(60));
WMMoveWidget(panel->copyrL, ScaleX(15), ScaleY(190));
WMResizeWidget(panel->copyrL, WMScaleX(360), WMScaleY(60));
WMMoveWidget(panel->copyrL, WMScaleX(15), WMScaleY(190));
WMSetLabelTextAlignment(panel->copyrL, WALeft);
WMSetLabelText(panel->copyrL, COPYRIGHT_TEXT);
font = WMSystemFontOfSize(scr->wmscreen, ScaleY(11));
font = WMSystemFontOfSize(scr->wmscreen, WMScaleY(11));
if (font) {
WMSetLabelFont(panel->copyrL, font);
WMReleaseFont(font);
@@ -1377,10 +1377,10 @@ void wShowInfoPanel(WScreen *scr)
#endif
panel->infoL = WMCreateLabel(panel->win);
WMResizeWidget(panel->infoL, ScaleX(350), ScaleY(80));
WMMoveWidget(panel->infoL, ScaleX(15), ScaleY(115));
WMResizeWidget(panel->infoL, WMScaleX(350), WMScaleY(80));
WMMoveWidget(panel->infoL, WMScaleX(15), WMScaleY(115));
WMSetLabelText(panel->infoL, strbuf);
font = WMSystemFontOfSize(scr->wmscreen, ScaleY(11));
font = WMSystemFontOfSize(scr->wmscreen, WMScaleY(11));
if (font) {
WMSetLabelFont(panel->infoL, font);
WMReleaseFont(font);
@@ -1451,7 +1451,7 @@ void wShowLegalPanel(WScreen *scr)
Window parent;
WWindow *wwin;
WMPoint center;
int fw, fh;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
if (legalPanel) {
@@ -1465,20 +1465,20 @@ void wShowLegalPanel(WScreen *scr)
panel = wmalloc(sizeof(LegalPanel));
panel->scr = scr;
panel->win = WMCreateWindow(scr->wmscreen, "legal");
WMGetScaleBaseFromSystemFont(scr->wmscreen, &fw, &fh);
pwidth = ScaleX(420);
pheight = ScaleY(250);
WMGetScaleBaseFromSystemFont(scr->wmscreen, &wmScaleWidth, &wmScaleHeight);
pwidth = WMScaleX(420);
pheight = WMScaleY(250);
WMResizeWidget(panel->win, pwidth, pheight);
panel->frame = WMCreateFrame(panel->win);
WMResizeWidget(panel->frame, pwidth - (2 * ScaleX(10)), pheight - (2 * ScaleY(10)));
WMMoveWidget(panel->frame, ScaleX(10), ScaleY(10));
WMResizeWidget(panel->frame, pwidth - (2 * WMScaleX(10)), pheight - (2 * WMScaleY(10)));
WMMoveWidget(panel->frame, WMScaleX(10), WMScaleY(10));
WMSetFrameTitle(panel->frame, NULL);
panel->licenseL = WMCreateLabel(panel->frame);
WMSetLabelWraps(panel->licenseL, True);
WMResizeWidget(panel->licenseL, pwidth - (4 * ScaleX(10)), pheight - (4 * ScaleY(10)));
WMMoveWidget(panel->licenseL, ScaleX(8), ScaleY(8));
WMResizeWidget(panel->licenseL, pwidth - (4 * WMScaleX(10)), pheight - (4 * WMScaleY(10)));
WMMoveWidget(panel->licenseL, WMScaleX(8), WMScaleY(8));
WMSetLabelTextAlignment(panel->licenseL, WALeft);
WMSetLabelText(panel->licenseL,
_(" Window Maker is free software; you can redistribute it and/or "

92
src/dockedapp.c
View File

@@ -226,27 +226,27 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
WMFont *font;
int x, y;
WMBox *vbox;
int fw, fh;
int wmScaleWidth, wmScaleHeight;
int pwidth, pheight;
int iconSize;
/* get the width and height values of the system font for use with the ScaleX/ScaleY macros */
WMGetScaleBaseFromSystemFont(scr->wmscreen, &fw, &fh);
/* get the width and height values of the system font for use with the WMScaleX/WMScaleY macros */
WMGetScaleBaseFromSystemFont(scr->wmscreen, &wmScaleWidth, &wmScaleHeight);
/* calculate the required width and height for the panel */
iconSize = wPreferences.icon_size;
pwidth = ScaleX(300);
pheight = ScaleY(10) /* upper margin */
+ iconSize /* icon and its label */
+ ScaleY(10) /* padding */
+ ScaleY(20) + ScaleY(2) /* start option */
+ ScaleY(20) + ScaleY(5) /* lock option */
+ ScaleY(50) + ScaleY(5) /* app path and arguments */
+ ScaleY(70) + ScaleY(5) /* middle-click command */
+ ScaleY(70) + ScaleY(5) /* drag&drop command */
+ ScaleY(50) + ScaleY(10) /* icon file */
+ ScaleY(24) /* buttons */
+ ScaleY(10); /* lower margin */
pwidth = WMScaleX(300);
pheight = WMScaleY(10) /* upper margin */
+ iconSize /* icon and its label */
+ WMScaleY(10) /* padding */
+ WMScaleY(20) + WMScaleY(2) /* start option */
+ WMScaleY(20) + WMScaleY(5) /* lock option */
+ WMScaleY(50) + WMScaleY(5) /* app path and arguments */
+ WMScaleY(70) + WMScaleY(5) /* middle-click command */
+ WMScaleY(70) + WMScaleY(5) /* drag&drop command */
+ WMScaleY(50) + WMScaleY(10) /* icon file */
+ WMScaleY(24) /* buttons */
+ WMScaleY(10); /* lower margin */
panel = wmalloc(sizeof(AppSettingsPanel));
@@ -260,13 +260,13 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
panel->iconLabel = WMCreateLabel(panel->win);
WMResizeWidget(panel->iconLabel, iconSize, iconSize);
WMMoveWidget(panel->iconLabel, ScaleX(10), ScaleY(10));
WMMoveWidget(panel->iconLabel, WMScaleX(10), WMScaleY(10));
WMSetLabelImagePosition(panel->iconLabel, WIPImageOnly);
panel->nameLabel = WMCreateLabel(panel->win);
font = WMBoldSystemFontOfSize(scr->wmscreen, ScaleY(14));
WMResizeWidget(panel->nameLabel, ScaleX(190), ScaleY(18));
WMMoveWidget(panel->nameLabel, 2 * ScaleX(10) + iconSize, ScaleY(10) + ((iconSize - WMFontHeight(font)) / 2));
font = WMBoldSystemFontOfSize(scr->wmscreen, WMScaleY(14));
WMResizeWidget(panel->nameLabel, WMScaleX(190), WMScaleY(18));
WMMoveWidget(panel->nameLabel, 2 * WMScaleX(10) + iconSize, WMScaleY(10) + ((iconSize - WMFontHeight(font)) / 2));
WMSetLabelTextAlignment(panel->nameLabel, WALeft);
WMSetLabelFont(panel->nameLabel, font);
WMReleaseFont(font);
@@ -276,41 +276,41 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
WMSetLabelText(panel->nameLabel, aicon->wm_class);
vbox = WMCreateBox(panel->win);
WMResizeWidget(vbox, pwidth - 2 * ScaleX(10), pheight - iconSize - 3 * ScaleY(10));
WMMoveWidget(vbox, ScaleX(10), iconSize + 2 * ScaleY(10));
WMResizeWidget(vbox, pwidth - 2 * WMScaleX(10), pheight - iconSize - 3 * WMScaleY(10));
WMMoveWidget(vbox, WMScaleX(10), iconSize + 2 * WMScaleY(10));
panel->autoLaunchBtn = WMCreateSwitchButton(vbox);
WMAddBoxSubview(vbox, WMWidgetView(panel->autoLaunchBtn), False, True, ScaleY(20), ScaleY(20), ScaleY(2));
WMAddBoxSubview(vbox, WMWidgetView(panel->autoLaunchBtn), False, True, WMScaleY(20), WMScaleY(20), WMScaleY(2));
WMSetButtonText(panel->autoLaunchBtn, _("Start when Window Maker is started"));
WMSetButtonSelected(panel->autoLaunchBtn, aicon->auto_launch);
panel->lockBtn = WMCreateSwitchButton(vbox);
WMAddBoxSubview(vbox, WMWidgetView(panel->lockBtn), False, True, ScaleY(20), ScaleY(20), ScaleY(5));
WMAddBoxSubview(vbox, WMWidgetView(panel->lockBtn), False, True, WMScaleY(20), WMScaleY(20), WMScaleY(5));
WMSetButtonText(panel->lockBtn, _("Lock (prevent accidental removal)"));
WMSetButtonSelected(panel->lockBtn, aicon->lock);
panel->commandFrame = WMCreateFrame(vbox);
WMSetFrameTitle(panel->commandFrame, _("Application path and arguments"));
WMAddBoxSubview(vbox, WMWidgetView(panel->commandFrame), False, True, ScaleY(50), ScaleY(50), ScaleY(5));
WMAddBoxSubview(vbox, WMWidgetView(panel->commandFrame), False, True, WMScaleY(50), WMScaleY(50), WMScaleY(5));
panel->commandField = WMCreateTextField(panel->commandFrame);
WMResizeWidget(panel->commandField, ScaleX(260), ScaleY(20));
WMMoveWidget(panel->commandField, ScaleX(10), ScaleY(20));
WMResizeWidget(panel->commandField, WMScaleX(260), WMScaleY(20));
WMMoveWidget(panel->commandField, WMScaleX(10), WMScaleY(20));
WMSetTextFieldText(panel->commandField, aicon->command);
WMMapSubwidgets(panel->commandFrame);
panel->pasteCommandFrame = WMCreateFrame(vbox);
WMSetFrameTitle(panel->pasteCommandFrame, _("Command for middle-click launch"));
WMAddBoxSubview(vbox, WMWidgetView(panel->pasteCommandFrame), False, True, ScaleY(70), ScaleY(70), ScaleY(5));
WMAddBoxSubview(vbox, WMWidgetView(panel->pasteCommandFrame), False, True, WMScaleY(70), WMScaleY(70), WMScaleY(5));
panel->pasteCommandField = WMCreateTextField(panel->pasteCommandFrame);
WMResizeWidget(panel->pasteCommandField, ScaleX(260), ScaleY(20));
WMMoveWidget(panel->pasteCommandField, ScaleX(10), ScaleY(20));
WMResizeWidget(panel->pasteCommandField, WMScaleX(260), WMScaleY(20));
WMMoveWidget(panel->pasteCommandField, WMScaleX(10), WMScaleY(20));
panel->pasteCommandLabel = WMCreateLabel(panel->pasteCommandFrame);
WMResizeWidget(panel->pasteCommandLabel, ScaleX(260), ScaleY(18));
WMMoveWidget(panel->pasteCommandLabel, ScaleX(10), ScaleY(45));
WMResizeWidget(panel->pasteCommandLabel, WMScaleX(260), WMScaleY(18));
WMMoveWidget(panel->pasteCommandLabel, WMScaleX(10), WMScaleY(45));
WMSetTextFieldText(panel->pasteCommandField, aicon->paste_command);
WMSetLabelText(panel->pasteCommandLabel, _("%s will be replaced with current selection"));
@@ -318,15 +318,15 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
panel->dndCommandFrame = WMCreateFrame(vbox);
WMSetFrameTitle(panel->dndCommandFrame, _("Command for dragged and dropped files"));
WMAddBoxSubview(vbox, WMWidgetView(panel->dndCommandFrame), False, True, ScaleY(70), ScaleY(70), ScaleY(5));
WMAddBoxSubview(vbox, WMWidgetView(panel->dndCommandFrame), False, True, WMScaleY(70), WMScaleY(70), WMScaleY(5));
panel->dndCommandField = WMCreateTextField(panel->dndCommandFrame);
WMResizeWidget(panel->dndCommandField, ScaleX(260), ScaleY(20));
WMMoveWidget(panel->dndCommandField, ScaleX(10), ScaleY(20));
WMResizeWidget(panel->dndCommandField, WMScaleX(260), WMScaleY(20));
WMMoveWidget(panel->dndCommandField, WMScaleX(10), WMScaleY(20));
panel->dndCommandLabel = WMCreateLabel(panel->dndCommandFrame);
WMResizeWidget(panel->dndCommandLabel, ScaleX(260), ScaleY(18));
WMMoveWidget(panel->dndCommandLabel, ScaleX(10), ScaleY(45));
WMResizeWidget(panel->dndCommandLabel, WMScaleX(260), WMScaleY(18));
WMMoveWidget(panel->dndCommandLabel, WMScaleX(10), WMScaleY(45));
#ifdef USE_DOCK_XDND
WMSetTextFieldText(panel->dndCommandField, aicon->dnd_command);
WMSetLabelText(panel->dndCommandLabel, _("%d will be replaced with the file name"));
@@ -341,16 +341,16 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
panel->iconFrame = WMCreateFrame(vbox);
WMSetFrameTitle(panel->iconFrame, _("Icon Image"));
WMAddBoxSubview(vbox, WMWidgetView(panel->iconFrame), False, True, ScaleY(50), ScaleY(50), ScaleY(10));
WMAddBoxSubview(vbox, WMWidgetView(panel->iconFrame), False, True, WMScaleY(50), WMScaleY(50), WMScaleY(10));
panel->iconField = WMCreateTextField(panel->iconFrame);
WMResizeWidget(panel->iconField, ScaleX(180), ScaleY(20));
WMMoveWidget(panel->iconField, ScaleX(10), ScaleY(20));
WMResizeWidget(panel->iconField, WMScaleX(180), WMScaleY(20));
WMMoveWidget(panel->iconField, WMScaleX(10), WMScaleY(20));
WMSetTextFieldText(panel->iconField, wDefaultGetIconFile(aicon->wm_instance, aicon->wm_class, False));
panel->browseBtn = WMCreateCommandButton(panel->iconFrame);
WMResizeWidget(panel->browseBtn, ScaleX(70), ScaleY(24));
WMMoveWidget(panel->browseBtn, ScaleX(200), ScaleY(18));
WMResizeWidget(panel->browseBtn, WMScaleX(70), WMScaleY(24));
WMMoveWidget(panel->browseBtn, WMScaleX(200), WMScaleY(18));
WMSetButtonText(panel->browseBtn, _("Browse..."));
WMSetButtonAction(panel->browseBtn, chooseIconCallback, panel);
@@ -359,17 +359,17 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
hbox = WMCreateBox(vbox);
WMSetBoxHorizontal(hbox, True);
WMAddBoxSubview(vbox, WMWidgetView(hbox), False, True, ScaleY(24), ScaleY(24), 0);
WMAddBoxSubview(vbox, WMWidgetView(hbox), False, True, WMScaleY(24), WMScaleY(24), 0);
panel->okBtn = WMCreateCommandButton(hbox);
WMSetButtonText(panel->okBtn, _("OK"));
WMSetButtonAction(panel->okBtn, panelBtnCallback, panel);
WMAddBoxSubviewAtEnd(hbox, WMWidgetView(panel->okBtn), False, True, ScaleX(80), ScaleX(80), 0);
WMAddBoxSubviewAtEnd(hbox, WMWidgetView(panel->okBtn), False, True, WMScaleX(80), WMScaleX(80), 0);
panel->cancelBtn = WMCreateCommandButton(hbox);
WMSetButtonText(panel->cancelBtn, _("Cancel"));
WMSetButtonAction(panel->cancelBtn, panelBtnCallback, panel);
WMAddBoxSubviewAtEnd(hbox, WMWidgetView(panel->cancelBtn), False, True, ScaleX(80), ScaleX(80), 5);
WMAddBoxSubviewAtEnd(hbox, WMWidgetView(panel->cancelBtn), False, True, WMScaleX(80), WMScaleX(80), 5);
WMMapSubwidgets(hbox);
}
@@ -396,13 +396,13 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
if (y < 0)
y = 0;
else if (y + pheight > rect.pos.y + rect.size.height)
y = rect.pos.y + rect.size.height - pheight - 3 * ScaleY(10);
y = rect.pos.y + rect.size.height - pheight - 3 * WMScaleY(10);
if (aicon->dock && aicon->dock->type == WM_DOCK) {
if (aicon->dock->on_right_side)
x = rect.pos.x + rect.size.width / 2;
else
x = rect.pos.x + rect.size.width / 2 - pwidth - ScaleX(2);
x = rect.pos.x + rect.size.width / 2 - pwidth - WMScaleX(2);
} else {
x = rect.pos.x + (rect.size.width - pwidth) / 2;
}