gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-20 05:44:13 +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

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 "