summaryrefslogtreecommitdiff
path: root/widgetfactory.cpp
diff options
context:
space:
mode:
authorJonas Kümmerlin <jonas@kuemmerlin.eu>2020-05-23 21:25:42 +0200
committerJonas Kümmerlin <jonas@kuemmerlin.eu>2020-05-23 21:25:42 +0200
commite9911ec586892bc150dbe39ecc1ecf300d89a6f4 (patch)
treee139e896dd8525a053bb025d0e1e17fbc803837f /widgetfactory.cpp
parent8e41fde785e952d6b7499386b4a34c99f1d034d2 (diff)
rework default button and focus handling
Diffstat (limited to 'widgetfactory.cpp')
-rw-r--r--widgetfactory.cpp21
1 files changed, 18 insertions, 3 deletions
diff --git a/widgetfactory.cpp b/widgetfactory.cpp
index f036387..8cdc6a4 100644
--- a/widgetfactory.cpp
+++ b/widgetfactory.cpp
@@ -20,7 +20,7 @@ static const TCHAR *g_paneLabels[PANE__MAX] = {
};
enum {
- ID_COMBO1,
+ ID_COMBO1 = 2,
ID_COMBO2,
ID_LBLCOMBOTEXT,
ID_BTNCOMBOCLEAR,
@@ -202,7 +202,7 @@ buttonPanelAttach(void *closure, HWND outerPanel)
ALF_AddLabel(panel, (WORD)-1, 4, 0, TEXT("native"));
ALF_AddLabel(panel, (WORD)-1, 0, 6, TEXT("layout dummy"));
- b = ALF_AddButton(panel, ID_HELLO, 2, 2, TEXT("&Hello, World!"));
+ b = ALF_AddButton(panel, (WORD)-1, 2, 2, TEXT("Hello, World!"));
ALF_SetWidgetLayoutMinSize(panel, b, 0, 0);
b = ALF_AddButton(panel, (WORD)-1, 2, 4, TEXT("Hello, World!"));
EnableWindow(b, FALSE);
@@ -882,7 +882,7 @@ WinMain
if (!win)
MessageBox(0, TEXT("couldn't create main window!"), 0, MB_ICONHAND|MB_OK);
- HWND hwndNtbk = ALF_AddNotebook(win, ID_NOTEBOOK, 0, 0);
+ HWND hwndNtbk = ALF_AddNotebook(win, ID_NOTEBOOK, 1, 1);
addPaneToNotebook(hwndNtbk, PANE_BUTTONS);
addPaneToNotebook(hwndNtbk, PANE_LABEL);
@@ -891,6 +891,21 @@ WinMain
addPaneToNotebook(hwndNtbk, PANE_COMBO);
addPaneToNotebook(hwndNtbk, PANE_GROUPBOX);
+ HWND btnpanel = ALF_AddPanel(win, (WORD)-1, 1, 3);
+ ALF_AddButton(btnpanel, ID_HELLO, 1, 3, TEXT("&Hello World!"));
+ ALF_AddButton(btnpanel, (WORD)-1, 3, 3, TEXT("Goodbye, World"));
+
+ ALF_LayoutSetRowMinSize(win, 2, 525);
+ ALF_LayoutSetRowMinSize(win, 0, 525);
+ ALF_LayoutSetRowMinSize(win, 4, 525);
+ ALF_LayoutSetColumnMinSize(win, 0, 525);
+ ALF_LayoutSetColumnMinSize(win, 2, 525);
+ ALF_LayoutSetRowExpandNumerator(win, 1, 1);
+ ALF_LayoutSetColumnExpandNumerator(win, 1, 1);
+
+ ALF_LayoutSetColumnExpandNumerator(btnpanel, 9, 1);
+ ALF_LayoutSetColumnMinSize(btnpanel, 2, 525);
+
ALF_SetDefaultButton(win, ID_HELLO);
ALF_ResizeWindow(win, 1, 1);