interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 678609581c into fea45b2d5b

This commit is contained in:
Francesco 2021-01-02 10:21:54 -05:00 committed by GitHub
parent fea45b2d5b 678609581c
commit bc955c83c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
windows/init.cpp
View File

@ -6,6 +6,7 @@ HINSTANCE hInstance;
int nCmdShow; int nCmdShow;
HFONT hMessageFont; HFONT hMessageFont;
uiWindowsSizing messageFontSizing;
// LONGTERM needed? // LONGTERM needed?
HBRUSH hollowBrush; HBRUSH hollowBrush;
@ -95,6 +96,11 @@ const char *uiInit(uiInitOptions *o)
if (hMessageFont == NULL) if (hMessageFont == NULL)
return ieLastErr("loading default messagebox font; this is the default UI font"); return ieLastErr("loading default messagebox font; this is the default UI font");
// Initialize to zero to means that the values are unknown.
messageFontSizing.BaseX = 0;
messageFontSizing.BaseY = 0;
messageFontSizing.InternalLeading = 0;
if (initContainer(hDefaultIcon, hDefaultCursor) == 0) if (initContainer(hDefaultIcon, hDefaultCursor) == 0)
return ieLastErr("initializing uiWindowsMakeContainer() window class"); return ieLastErr("initializing uiWindowsMakeContainer() window class");

5
windows/sizing.cpp
View File

@ -34,7 +34,10 @@ void getSizing(HWND hwnd, uiWindowsSizing *sizing, HFONT font)
void uiWindowsGetSizing(HWND hwnd, uiWindowsSizing *sizing) void uiWindowsGetSizing(HWND hwnd, uiWindowsSizing *sizing)
{ {
return getSizing(hwnd, sizing, hMessageFont); if (messageFontSizing.BaseX == 0) {
getSizing(hwnd, &messageFontSizing, hMessageFont);
}
*sizing = messageFontSizing;
} }
#define dlgUnitsToX(dlg, baseX) MulDiv((dlg), (baseX), 4) #define dlgUnitsToX(dlg, baseX) MulDiv((dlg), (baseX), 4)

2
windows/uipriv_windows.hpp
View File

@ -86,6 +86,8 @@ extern void setWindowText(HWND hwnd, WCHAR *wtext);
extern HINSTANCE hInstance; extern HINSTANCE hInstance;
extern int nCmdShow; extern int nCmdShow;
extern HFONT hMessageFont; extern HFONT hMessageFont;
// keep memory of text metric values given in getSizing in sizing.cpp
extern uiWindowsSizing messageFontSizing;
extern HBRUSH hollowBrush; extern HBRUSH hollowBrush;
extern uiInitOptions options; extern uiInitOptions options;