From ffb723122057e30244cab59ea07b18ae71104359 Mon Sep 17 00:00:00 2001 From: Jonas Kümmerlin Date: Tue, 26 May 2020 18:27:26 +0200 Subject: layout: support for spanning cells mostly untested for now --- widgetfactory.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'widgetfactory.cpp') diff --git a/widgetfactory.cpp b/widgetfactory.cpp index 20a56c5..315a95c 100644 --- a/widgetfactory.cpp +++ b/widgetfactory.cpp @@ -843,6 +843,7 @@ WinMain ALF_SetText(win, TEXT("Widget Factory")); HWND hwndNtbk = ALF_AddNotebook(win, ID_NOTEBOOK, 1, 1); + ALF_SetWidgetLayoutSpan(win, hwndNtbk, 4, 1); addPaneToNotebook(hwndNtbk, PANE_BUTTONS); addPaneToNotebook(hwndNtbk, PANE_LABEL); @@ -851,20 +852,17 @@ WinMain addPaneToNotebook(hwndNtbk, PANE_COMBO); addPaneToNotebook(hwndNtbk, PANE_GROUPBOX); - HWND btnpanel = ALF_AddPanel(win, (WORD)-1, 1, 3); - ALF_AddNativeButton(btnpanel, ID_HELLO, 1, 3, TEXT("&Hello World!")); - ALF_AddNativeButton(btnpanel, (WORD)-1, 3, 3, TEXT("Goodbye, World")); + ALF_AddNativeButton(win, ID_HELLO, 1, 3, TEXT("&Hello World!")); + ALF_AddNativeButton(win, (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_LayoutSetColumnMinSize(win, 5, 525); ALF_LayoutSetRowExpandNumerator(win, 1, 1); - ALF_LayoutSetColumnExpandNumerator(win, 1, 1); - - ALF_LayoutSetColumnExpandNumerator(btnpanel, 9, 1); - ALF_LayoutSetColumnMinSize(btnpanel, 2, 525); + ALF_LayoutSetColumnExpandNumerator(win, 4, 1); ALF_SetDefaultButton(win, ID_HELLO); -- cgit v1.2.3