Mercurial > hg > toolkit / changeset

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/winui/container.cpp	Mon May 29 12:48:42 2023 +0200
@@ -0,0 +1,72 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2023 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "container.h"
+
+
+UiBoxContainer::UiBoxContainer(Grid grid, enum UiBoxContainerType type) {
+	this->grid = grid;
+	this->type = type;
+
+	// hbox needs one row def, vbox needs one col def
+	// all other col/row defs are created when elements are added
+	if (type == UI_CONTAINER_HBOX) {
+		RowDefinition rowdef = RowDefinition();
+		grid.RowDefinitions().Append(rowdef);
+	} else {
+		ColumnDefinition coldef = ColumnDefinition();
+		grid.ColumnDefinitions().Append(coldef);
+	}
+}
+
+void UiBoxContainer::Add(Control control, UiBool fill) {
+	GridLength gl;
+	if (fill) {
+		gl.Value = 1;
+		gl.GridUnitType = GridUnitType::Star;
+	}
+	else {
+		gl.Value = 0;
+		gl.GridUnitType = GridUnitType::Auto;
+	}
+	
+	if (type == UI_CONTAINER_HBOX) {
+		ColumnDefinition coldef = ColumnDefinition();
+		coldef.Width(gl);
+		grid.ColumnDefinitions().Append(coldef);
+		grid.SetColumn(control, grid.Children().Size());
+	} else {
+		RowDefinition rowdef = RowDefinition();
+		rowdef.Height(gl);
+		grid.RowDefinitions().Append(rowdef);
+		grid.SetRow(control, grid.Children().Size());
+	}
+
+	grid.Children().Append(control);
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/winui/container.h	Mon May 29 12:48:42 2023 +0200
@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2023 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "toolkit.h"
+#include "../ui/container.h"
+
+#include <Windows.h>
+#undef GetCurrentTime
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.UI.Xaml.Interop.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
+#include <winrt/Microsoft.UI.Xaml.Markup.h>
+
+typedef struct UiLayout UiLayout;
+typedef enum UiLayoutBool UiLayoutBool;
+
+using namespace winrt;
+using namespace Microsoft::UI::Xaml;
+using namespace Microsoft::UI::Xaml::Controls;
+using namespace Microsoft::UI::Xaml::XamlTypeInfo;
+using namespace Microsoft::UI::Xaml::Markup;
+using namespace Windows::UI::Xaml::Interop;
+
+enum UiLayoutBool {
+    UI_LAYOUT_UNDEFINED = 0,
+    UI_LAYOUT_TRUE,
+    UI_LAYOUT_FALSE,
+};
+
+struct UiLayout {
+    UiLayoutBool fill;
+    UiBool       newline;
+    char* label;
+    UiBool       hexpand;
+    UiBool       vexpand;
+    int          width;
+    int          gridwidth;
+};
+
+struct UiContainer {
+    UiLayout layout;
+    int close;
+
+    virtual void Add(Control control, UiBool fill) = 0;
+};
+
+enum UiBoxContainerType {
+    UI_CONTAINER_HBOX = 0,
+    UI_CONTAINER_VBOX
+};
+
+struct UiBoxContainer : UiContainer {
+    Grid grid;
+    enum UiBoxContainerType type;
+
+    UiBoxContainer(Grid grid, enum UiBoxContainerType type);
+
+    void Add(Control control, UiBool fill);
+};

--- a/ui/winui/window.cpp	Mon May 29 10:37:23 2023 +0200
+++ b/ui/winui/window.cpp	Mon May 29 12:48:42 2023 +0200
@@ -38,6 +38,7 @@
 #include <winrt/Microsoft.UI.Xaml.Markup.h>
 
 #include "appmenu.h"
+#include "container.h"
 
 #include "../common/context.h"
 
@@ -66,13 +67,27 @@
 	Grid grid = Grid();
 	obj->wobj.Content(grid);
 
+	obj->container = new UiBoxContainer(grid, UI_CONTAINER_VBOX);
+
 	if (uic_get_menu_list()) {
+		// create/add menubar
 		MenuBar mb = ui_create_menubar(obj);
 		mb.VerticalAlignment(VerticalAlignment::Top);
-		grid.Children().Append(mb);
+		obj->container->Add(mb, false);
 	}
 
+	Button b1 = Button();
+	Button b2 = Button();
+
+	b1.Content(box_value(L"Button 1"));
+	b2.Content(box_value(L"Button 2"));
+
+	obj->container->Add(b1, false);
+	obj->container->Add(b2, false);
+
+
 	obj->window = window_data;
+	
 
 	return obj;
 }

--- a/ui/winui/winui.vcxproj	Mon May 29 10:37:23 2023 +0200
+++ b/ui/winui/winui.vcxproj	Mon May 29 12:48:42 2023 +0200
@@ -118,6 +118,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\ucx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>
       </AdditionalOptions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -149,6 +150,7 @@
     <ClCompile Include="..\common\types.c" />
     <ClCompile Include="..\common\ucx_properties.c" />
     <ClCompile Include="appmenu.cpp" />
+    <ClCompile Include="container.cpp" />
     <ClCompile Include="toolkit.cpp" />
     <ClCompile Include="util.cpp" />
     <ClCompile Include="window.cpp" />
@@ -165,6 +167,7 @@
     <ClInclude Include="..\common\types.h" />
     <ClInclude Include="..\common\ucx_properties.h" />
     <ClInclude Include="appmenu.h" />
+    <ClInclude Include="container.h" />
     <ClInclude Include="toolkit.h" />
     <ClInclude Include="util.h" />
     <ClInclude Include="window.h" />

--- a/ui/winui/winui.vcxproj.filters	Mon May 29 10:37:23 2023 +0200
+++ b/ui/winui/winui.vcxproj.filters	Mon May 29 12:48:42 2023 +0200
@@ -54,6 +54,9 @@
     <ClCompile Include="util.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="container.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -92,5 +95,8 @@
     <ClInclude Include="util.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="container.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file