From a9dab61430969f903b0ba9f584483a6d47dde1bf Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Sat, 30 Jun 2018 20:06:04 +0200 Subject: [PATCH 1/2] Implement uiEntry's method to set width to char numbers Only for windows and unix implementation. --- ui.h | 1 + ui_windows.h | 1 + unix/entry.c | 5 +++++ windows/entry.cpp | 21 +++++++++++++++++---- windows/sizing.cpp | 6 ++++++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ui.h b/ui.h index b5fb9a27..11fe8d57 100644 --- a/ui.h +++ b/ui.h @@ -164,6 +164,7 @@ _UI_EXTERN void uiEntrySetText(uiEntry *e, const char *text); _UI_EXTERN void uiEntryOnChanged(uiEntry *e, void (*f)(uiEntry *e, void *data), void *data); _UI_EXTERN int uiEntryReadOnly(uiEntry *e); _UI_EXTERN void uiEntrySetReadOnly(uiEntry *e, int readonly); +_UI_EXTERN void uiEntrySetWidthChars(uiEntry *e, int nchars); _UI_EXTERN uiEntry *uiNewEntry(void); _UI_EXTERN uiEntry *uiNewPasswordEntry(void); _UI_EXTERN uiEntry *uiNewSearchEntry(void); diff --git a/ui_windows.h b/ui_windows.h index 69dda366..dc00f2a3 100644 --- a/ui_windows.h +++ b/ui_windows.h @@ -242,6 +242,7 @@ struct uiWindowsSizing { }; _UI_EXTERN void uiWindowsGetSizing(HWND hwnd, uiWindowsSizing *sizing); _UI_EXTERN void uiWindowsSizingDlgUnitsToPixels(uiWindowsSizing *sizing, int *x, int *y); +_UI_EXTERN void uiWindowsSizingCharsToPixels(uiWindowsSizing *sizing, int *x, int *y, int width_chars); _UI_EXTERN void uiWindowsSizingStandardPadding(uiWindowsSizing *sizing, int *x, int *y); // TODO document diff --git a/unix/entry.c b/unix/entry.c index 4a9a1d04..af779a3f 100644 --- a/unix/entry.c +++ b/unix/entry.c @@ -95,3 +95,8 @@ uiEntry *uiNewSearchEntry(void) { return finishNewEntry(gtk_search_entry_new(), "search-changed"); } + +void uiEntrySetWidthChars(uiEntry *e, int nchars) +{ + gtk_entry_set_width_chars(e->entry, nchars); +} diff --git a/windows/entry.cpp b/windows/entry.cpp index a7a077f2..fb291364 100644 --- a/windows/entry.cpp +++ b/windows/entry.cpp @@ -7,6 +7,7 @@ struct uiEntry { void (*onChanged)(uiEntry *, void *); void *onChangedData; BOOL inhibitChanged; + int width_chars; }; static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult) @@ -43,10 +44,15 @@ static void uiEntryMinimumSize(uiWindowsControl *c, int *width, int *height) uiWindowsSizing sizing; int x, y; - x = entryWidth; - y = entryHeight; - uiWindowsGetSizing(e->hwnd, &sizing); - uiWindowsSizingDlgUnitsToPixels(&sizing, &x, &y); + if (e->width_chars <= 0) { + x = entryWidth; + y = entryHeight; + uiWindowsGetSizing(e->hwnd, &sizing); + uiWindowsSizingDlgUnitsToPixels(&sizing, &x, &y); + } else { + uiWindowsGetSizing(e->hwnd, &sizing); + uiWindowsSizingCharsToPixels(&sizing, &x, &y, e->width_chars); + } *width = x; *height = y; } @@ -107,6 +113,8 @@ static uiEntry *finishNewEntry(DWORD style) uiWindowsRegisterWM_COMMANDHandler(e->hwnd, onWM_COMMAND, uiControl(e)); uiEntryOnChanged(e, defaultOnChanged, NULL); + e->width_chars = 0; + return e; } @@ -132,3 +140,8 @@ uiEntry *uiNewSearchEntry(void) // TODO will hr be S_OK if themes are disabled? return e; } + +void uiEntrySetWidthChars(uiEntry *e, int nchars) +{ + e->width_chars = nchars; +} diff --git a/windows/sizing.cpp b/windows/sizing.cpp index 33cc00b9..b6fa55de 100644 --- a/windows/sizing.cpp +++ b/windows/sizing.cpp @@ -48,6 +48,12 @@ void uiWindowsSizingDlgUnitsToPixels(uiWindowsSizing *sizing, int *x, int *y) *y = dlgUnitsToY(*y, sizing->BaseY); } +void uiWindowsSizingCharsToPixels(uiWindowsSizing *sizing, int *x, int *y, int width_chars) +{ + *x = sizing->BaseX * width_chars; + *y = sizing->BaseY; +} + // from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing and https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx // this X value is really only for buttons but I don't see a better one :/ #define winXPadding 4 From e19f78f56ff61d62704a3e32d145b9daa8ce08c6 Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Sat, 30 Jun 2018 23:06:33 +0200 Subject: [PATCH 2/2] Ensure only x size of entry is changed --- ui_windows.h | 2 +- windows/entry.cpp | 14 ++++++-------- windows/sizing.cpp | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ui_windows.h b/ui_windows.h index dc00f2a3..bd848c15 100644 --- a/ui_windows.h +++ b/ui_windows.h @@ -242,7 +242,7 @@ struct uiWindowsSizing { }; _UI_EXTERN void uiWindowsGetSizing(HWND hwnd, uiWindowsSizing *sizing); _UI_EXTERN void uiWindowsSizingDlgUnitsToPixels(uiWindowsSizing *sizing, int *x, int *y); -_UI_EXTERN void uiWindowsSizingCharsToPixels(uiWindowsSizing *sizing, int *x, int *y, int width_chars); +_UI_EXTERN void uiWindowsSizingCharsToPixels(uiWindowsSizing *sizing, int *x, int width_chars); _UI_EXTERN void uiWindowsSizingStandardPadding(uiWindowsSizing *sizing, int *x, int *y); // TODO document diff --git a/windows/entry.cpp b/windows/entry.cpp index fb291364..dd017c80 100644 --- a/windows/entry.cpp +++ b/windows/entry.cpp @@ -44,14 +44,12 @@ static void uiEntryMinimumSize(uiWindowsControl *c, int *width, int *height) uiWindowsSizing sizing; int x, y; - if (e->width_chars <= 0) { - x = entryWidth; - y = entryHeight; - uiWindowsGetSizing(e->hwnd, &sizing); - uiWindowsSizingDlgUnitsToPixels(&sizing, &x, &y); - } else { - uiWindowsGetSizing(e->hwnd, &sizing); - uiWindowsSizingCharsToPixels(&sizing, &x, &y, e->width_chars); + x = entryWidth; + y = entryHeight; + uiWindowsGetSizing(e->hwnd, &sizing); + uiWindowsSizingDlgUnitsToPixels(&sizing, &x, &y); + if (e->width_chars > 0) { + uiWindowsSizingCharsToPixels(&sizing, &x, e->width_chars); } *width = x; *height = y; diff --git a/windows/sizing.cpp b/windows/sizing.cpp index b6fa55de..2db4171b 100644 --- a/windows/sizing.cpp +++ b/windows/sizing.cpp @@ -48,10 +48,10 @@ void uiWindowsSizingDlgUnitsToPixels(uiWindowsSizing *sizing, int *x, int *y) *y = dlgUnitsToY(*y, sizing->BaseY); } -void uiWindowsSizingCharsToPixels(uiWindowsSizing *sizing, int *x, int *y, int width_chars) +void uiWindowsSizingCharsToPixels(uiWindowsSizing *sizing, int *x, int width_chars) { - *x = sizing->BaseX * width_chars; - *y = sizing->BaseY; + if (x != NULL) + *x = sizing->BaseX * width_chars; } // from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing and https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx