WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit a207430

Browse files
authored
Merge pull request #209 from reactivemarbles/AddNewControlsToAvaloniaUI
Refactor gallery to use CrissCross controls and add new demos
2 parents 1d59b21 + 03478dd commit a207430

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3706
-781
lines changed

src/CrissCross.Avalonia.UI.Gallery/Views/MainWindow.axaml.cs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@ protected override bool RegisterContentPresenter(ContentPresenter presenter)
5959
// Create custom layout with navigation menu and navigation frame
6060
if (presenter.Name == "PART_ContentPresenter" && presenter.Content == null)
6161
{
62-
// Create the main layout grid
63-
var mainGrid = new Grid();
62+
// Create the main layout grid using CrissCross Grid
63+
var mainGrid = new UI.Controls.Grid();
6464
mainGrid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
6565
mainGrid.RowDefinitions.Add(new RowDefinition(GridLength.Star));
6666

67-
// Title Bar
68-
var titleBorder = new Border
67+
// Title Bar using CrissCross Border
68+
var titleBorder = new UI.Controls.Border
6969
{
7070
Background = Brush.Parse("#2D2D30"),
7171
Padding = new Thickness(16, 12)
7272
};
73-
var titleText = new TextBlock
73+
var titleText = new UI.Controls.TextBlock
7474
{
7575
Text = "CrissCross Avalonia UI Gallery",
7676
FontSize = 24,
@@ -81,25 +81,25 @@ protected override bool RegisterContentPresenter(ContentPresenter presenter)
8181
mainGrid.Children.Add(titleBorder);
8282
Grid.SetRow(titleBorder, 0);
8383

84-
// Content area grid (navigation menu + content)
85-
var contentGrid = new Grid();
84+
// Content area grid (navigation menu + content) using CrissCross Grid
85+
var contentGrid = new UI.Controls.Grid();
8686
contentGrid.ColumnDefinitions.Add(new ColumnDefinition(new GridLength(250)));
8787
contentGrid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star));
8888
mainGrid.Children.Add(contentGrid);
8989
Grid.SetRow(contentGrid, 1);
9090

91-
// Navigation Menu
92-
var navBorder = new Border
91+
// Navigation Menu using CrissCross Border
92+
var navBorder = new UI.Controls.Border
9393
{
9494
Background = Brush.Parse("#252526"),
9595
BorderBrush = Brush.Parse("#3F3F46"),
9696
BorderThickness = new Thickness(0, 0, 1, 0)
9797
};
9898
var navScrollViewer = new ScrollViewer();
99-
var navStack = new StackPanel { Margin = new Thickness(8) };
99+
var navStack = new UI.Controls.StackPanel { Margin = new Thickness(8) };
100100

101-
// Navigation header
102-
var navHeader = new TextBlock
101+
// Navigation header using CrissCross TextBlock
102+
var navHeader = new UI.Controls.TextBlock
103103
{
104104
Text = "Control Categories",
105105
FontSize = 16,
@@ -109,68 +109,68 @@ protected override bool RegisterContentPresenter(ContentPresenter presenter)
109109
};
110110
navStack.Children.Add(navHeader);
111111

112-
// Home button
112+
// Home button using CrissCross Button
113113
AddNavigationButton(navStack, "🏠 Home", "GotoHome");
114114

115-
// Basic Controls Expander
116-
var basicExpander = new Expander
115+
// Basic Controls Expander using CrissCross Expander
116+
var basicExpander = new UI.Controls.Expander
117117
{
118118
Header = "Basic Controls",
119119
IsExpanded = true,
120120
Margin = new Thickness(0, 8, 0, 8)
121121
};
122-
var basicStack = new StackPanel { Margin = new Thickness(16, 8, 0, 8) };
122+
var basicStack = new UI.Controls.StackPanel { Margin = new Thickness(16, 8, 0, 8) };
123123
AddNavigationButton(basicStack, "Button", "GotoButtons");
124124
AddNavigationButton(basicStack, "CheckBox", "GotoCheckBox");
125125
AddNavigationButton(basicStack, "RadioButton", "GotoRadioButton");
126126
basicExpander.Content = basicStack;
127127
navStack.Children.Add(basicExpander);
128128

129-
// Input Controls Expander
130-
var inputExpander = new Expander
129+
// Input Controls Expander using CrissCross Expander
130+
var inputExpander = new UI.Controls.Expander
131131
{
132132
Header = "Input Controls",
133133
IsExpanded = true,
134134
Margin = new Thickness(0, 0, 0, 8)
135135
};
136-
var inputStack = new StackPanel { Margin = new Thickness(16, 8, 0, 8) };
136+
var inputStack = new UI.Controls.StackPanel { Margin = new Thickness(16, 8, 0, 8) };
137137
AddNavigationButton(inputStack, "TextBox", "GotoInput");
138138
AddNavigationButton(inputStack, "ComboBox", "GotoComboBox");
139139
AddNavigationButton(inputStack, "Slider", "GotoSlider");
140140
inputExpander.Content = inputStack;
141141
navStack.Children.Add(inputExpander);
142142

143-
// Date & Time Expander
144-
var dateExpander = new Expander
143+
// Date & Time Expander using CrissCross Expander
144+
var dateExpander = new UI.Controls.Expander
145145
{
146146
Header = "Date & Time",
147147
IsExpanded = true,
148148
Margin = new Thickness(0, 0, 0, 8)
149149
};
150-
var dateStack = new StackPanel { Margin = new Thickness(16, 8, 0, 8) };
150+
var dateStack = new UI.Controls.StackPanel { Margin = new Thickness(16, 8, 0, 8) };
151151
AddNavigationButton(dateStack, "DatePicker", "GotoDatePicker");
152152
dateExpander.Content = dateStack;
153153
navStack.Children.Add(dateExpander);
154154

155-
// Color Expander
156-
var colorExpander = new Expander
155+
// Color Expander using CrissCross Expander
156+
var colorExpander = new UI.Controls.Expander
157157
{
158158
Header = "Color Controls",
159159
IsExpanded = true,
160160
Margin = new Thickness(0, 0, 0, 8)
161161
};
162-
var colorStack = new StackPanel { Margin = new Thickness(16, 8, 0, 8) };
162+
var colorStack = new UI.Controls.StackPanel { Margin = new Thickness(16, 8, 0, 8) };
163163
AddNavigationButton(colorStack, "ColorPicker", "GotoColorPicker");
164164
colorExpander.Content = colorStack;
165165
navStack.Children.Add(colorExpander);
166166

167-
// Progress Expander
168-
var progressExpander = new Expander
167+
// Progress Expander using CrissCross Expander
168+
var progressExpander = new UI.Controls.Expander
169169
{
170170
Header = "Progress",
171171
Margin = new Thickness(0, 0, 0, 8)
172172
};
173-
var progressStack = new StackPanel { Margin = new Thickness(16, 8, 0, 8) };
173+
var progressStack = new UI.Controls.StackPanel { Margin = new Thickness(16, 8, 0, 8) };
174174
AddNavigationButton(progressStack, "ProgressBar", "GotoProgress");
175175
progressExpander.Content = progressStack;
176176
navStack.Children.Add(progressExpander);
@@ -180,8 +180,8 @@ protected override bool RegisterContentPresenter(ContentPresenter presenter)
180180
contentGrid.Children.Add(navBorder);
181181
Grid.SetColumn(navBorder, 0);
182182

183-
// Content Display Area with NavigationFrame from base class
184-
var contentBorder = new Border
183+
// Content Display Area with NavigationFrame from base class using CrissCross Border
184+
var contentBorder = new UI.Controls.Border
185185
{
186186
Background = Brush.Parse("#1E1E1E"),
187187
Padding = new Thickness(0),
@@ -196,9 +196,9 @@ protected override bool RegisterContentPresenter(ContentPresenter presenter)
196196
return base.RegisterContentPresenter(presenter);
197197
}
198198

199-
private static void AddNavigationButton(StackPanel stack, string content, string commandBinding)
199+
private static void AddNavigationButton(UI.Controls.StackPanel stack, string content, string commandBinding)
200200
{
201-
var button = new Button
201+
var button = new UI.Controls.Button
202202
{
203203
Content = content,
204204
Margin = new Thickness(0, 4),

0 commit comments

Comments
 (0)