Wed, 11 Oct 2023 19:11:38 +0200
add toolbar appmenu and menu buttons
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2023 Olaf Wintermann. All rights reserved. |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
29 | #include "pch.h" |
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
30 | |
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include "window.h" |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | |
180
f34953bf4ac7
add basic winui menu implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
33 | #include "appmenu.h" |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
34 | #include "commandbar.h" |
182
6cf690e042bd
add window container (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
35 | #include "container.h" |
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
36 | #include "util.h" |
180
f34953bf4ac7
add basic winui menu implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
37 | |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
38 | #include "../common/context.h" |
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
39 | |
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | #include <stdlib.h> |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | |
187
24ce2c326d85
implement toggle button (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
42 | #include <cx/mempool.h> |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
43 | |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
44 | #include "MainWindow.xaml.h" |
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
45 | |
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | using namespace winrt; |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | using namespace Microsoft::UI::Xaml; |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | using namespace Microsoft::UI::Xaml::Controls; |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | using namespace Microsoft::UI::Xaml::XamlTypeInfo; |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | using namespace Microsoft::UI::Xaml::Markup; |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | using namespace Windows::UI::Xaml::Interop; |
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
52 | using namespace winrt::Windows::Foundation; |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
53 | |
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
54 | UiWindow::UiWindow(winrt::Microsoft::UI::Xaml::Window& win) : window(win) {} |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
55 | |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
56 | UiObject* ui_window(const char* title, void* window_data) { |
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
57 | CxMempool* mp = cxBasicMempoolCreate(256); |
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
58 | UiObject* obj = (UiObject*)cxCalloc(mp->allocator, 1, sizeof(UiObject)); |
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
59 | |
187
24ce2c326d85
implement toggle button (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
60 | obj->ctx = uic_context(obj, mp); |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
61 | obj->window = window_data; |
180
f34953bf4ac7
add basic winui menu implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
62 | |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
63 | //Window window = Window(); |
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
64 | Window window = make<winui::implementation::MainWindow>(); |
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
65 | if (title) { |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
66 | wchar_t *wtitle = str2wstr(title, nullptr); |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
67 | window.Title(wtitle); |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
68 | free(wtitle); |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
69 | } |
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
70 | |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
71 | //auto backdrop = winrt::Microsoft::UI::Xaml::Media::MicaBackdrop(); |
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
72 | //backdrop.Kind(winrt::Microsoft::UI::Composition::SystemBackdrops::MicaKind::Base); // alternative: BaseAlt |
200
f40dadf3498f
add unfinished navigationview (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
195
diff
changeset
|
73 | // TODO: https://learn.microsoft.com/en-us/windows/apps/windows-app-sdk/system-backdrop-controller#example-use-mica-in-a-windows-appsdkwinui-3-app |
f40dadf3498f
add unfinished navigationview (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
195
diff
changeset
|
74 | |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
75 | Grid grid = Grid(); |
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
76 | window.Content(grid); |
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
77 | |
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
78 | obj->wobj = new UiWindow(window); |
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
79 | |
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
80 | |
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
81 | window.Closed([obj](IInspectable const& sender, WindowEventArgs) { |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
82 | // TODO: destroy UiObject*, context, ... |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
83 | delete obj->wobj; |
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
84 | }); |
180
f34953bf4ac7
add basic winui menu implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
85 | |
195
0f2e69873875
add expander (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
190
diff
changeset
|
86 | obj->container = new UiBoxContainer(grid, UI_BOX_CONTAINER_VBOX, 0, 0); |
182
6cf690e042bd
add window container (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
87 | |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
88 | if (uic_get_menu_list()) { |
182
6cf690e042bd
add window container (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
89 | // create/add menubar |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
90 | MenuBar mb = ui_create_menubar(obj); |
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
91 | mb.VerticalAlignment(VerticalAlignment::Top); |
182
6cf690e042bd
add window container (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
92 | obj->container->Add(mb, false); |
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | } |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
95 | if (uic_toolbar_isenabled()) { |
206
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
96 | // create commandbar |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
97 | CommandBar toolbar = ui_create_toolbar(obj); |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
98 | // wrap the commandbar in a stackpanel, because we |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
99 | // don't want to fill the horizontal space |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
100 | StackPanel toolbar_panel = StackPanel(); |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
101 | toolbar_panel.Orientation(Orientation::Horizontal); |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
102 | toolbar_panel.Children().Append(toolbar); |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
103 | |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
104 | toolbar_panel.VerticalAlignment(VerticalAlignment::Top); |
7ebc5a747c6f
implement toolbar togglebutton
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
105 | obj->container->Add(toolbar_panel, false); |
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
106 | } |
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
107 | |
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
180
diff
changeset
|
108 | obj->window = window_data; |
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
182
diff
changeset
|
109 | |
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | return obj; |
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | } |