Skip to content

Commit a1fa39c

Browse files
adospaceadospace
committed
3.0.33 - Fixes bug in Grid columns not correctly laying out
1 parent f3dddd0 commit a1fa39c

File tree

4 files changed

+192
-150
lines changed

4 files changed

+192
-150
lines changed

‎.github/workflows/build-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
Solution_Name: ./src/MauiReactor.Build.sln
1717
Test_Project: ./samples/UnitTests/UnitTests.csproj
1818
TemplatePack_Name: ./src/MauiReactor.TemplatePack/MauiReactor.TemplatePack.csproj
19-
Version: 3.0.32
19+
Version: 3.0.33
2020

2121
steps:
2222
- name: Checkout

‎samples/MauiReactor.TestApp/HomePage.cs‎

Lines changed: 152 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -13,157 +13,161 @@ public override VisualNode Render()
1313
{
1414
return new Shell
1515
{
16-
new FlyoutItem("Counter")
17-
{
18-
new CounterPage()
19-
},
20-
new FlyoutItem("Counter with service")
21-
{
22-
new CounterWithServicePage()
23-
},
24-
new FlyoutItem("Parameters")
25-
{
26-
new ParametersPage()
27-
},
28-
new FlyoutItem("CollectionView")
29-
{
30-
new CollectionViewPage()
31-
},
32-
new FlyoutItem("EditableCollectionView")
33-
{
34-
new EditableCollectionView()
35-
},
36-
new FlyoutItem("ListView")
37-
{
38-
new ListViewPage()
39-
},
40-
new FlyoutItem("ListView Extended Test")
41-
{
42-
new ListViewExtendedTestPage()
43-
},
44-
new FlyoutItem("AnimationBasics")
45-
{
46-
new AnimationBasics()
47-
},
48-
new FlyoutItem("CardsAnimation")
49-
{
50-
new CardsAnimationPage()
51-
},
52-
new FlyoutItem("CanvasCardsAnimationPage")
53-
{
54-
new CanvasCardsAnimationPage()
55-
},
56-
new FlyoutItem("Image")
57-
{
58-
new ImagePage()
59-
},
60-
new FlyoutItem("AnimatedCollectionView")
61-
{
62-
new AnimatedCollectionViewPage()
63-
},
64-
new FlyoutItem("AnimationShowcase")
65-
{
66-
new AnimationShowcasePage()
67-
},
68-
new FlyoutItem("AnimationLoop")
69-
{
70-
new AnimationLoopPage()
71-
},
72-
new FlyoutItem("Navigation")
73-
{
74-
new NavigationMainPage()
75-
},
76-
new FlyoutItem("ElementRef")
77-
{
78-
new ElementRefPage()
79-
},
80-
new FlyoutItem("Canvas")
81-
{
82-
new CanvasPage()
83-
},
84-
new FlyoutItem("Landscape")
85-
{
86-
new LandscapePage()
87-
},
88-
new FlyoutItem("GraphicsView")
89-
{
90-
new GraphicsViewPage()
91-
},
92-
new FlyoutItem("RemainingItemsThreshold Test")
93-
{
94-
new RemainingItemsThresholdTestPage()
95-
},
96-
new FlyoutItem("AnimatedButtonPage")
97-
{
98-
new AnimatedButtonPage()
99-
},
100-
new FlyoutItem("Border Corner Radius Test")
101-
{
102-
new BorderCornerRadiusPage()
103-
},
104-
new FlyoutItem("Show Popup Test")
105-
{
106-
new ShowPopupTestPage()
107-
},
108-
new FlyoutItem("Carousel Test")
109-
{
110-
new CarouselTestPage()
111-
},
112-
new FlyoutItem("Carousel with Images Test")
113-
{
114-
new CarouselTestWithImagesPage()
115-
},
116-
new FlyoutItem("Canvas AutoV/HStack Test")
117-
{
118-
new CanvasAutoStackPage()
119-
},
120-
new FlyoutItem("Inline components")
121-
{
122-
new InlineComponentsPage()
123-
},
124-
new FlyoutItem("Collection View Grouped")
125-
{
126-
new CollectionViewExtendedTestPage()
127-
},
128-
new FlyoutItem("Drag & Drop")
129-
{
130-
new DragDropTestPage()
131-
},
16+
//new FlyoutItem("Counter")
17+
//{
18+
// new CounterPage()
19+
//},
20+
//new FlyoutItem("Counter with service")
21+
//{
22+
// new CounterWithServicePage()
23+
//},
24+
//new FlyoutItem("Parameters")
25+
//{
26+
// new ParametersPage()
27+
//},
28+
//new FlyoutItem("CollectionView")
29+
//{
30+
// new CollectionViewPage()
31+
//},
32+
//new FlyoutItem("EditableCollectionView")
33+
//{
34+
// new EditableCollectionView()
35+
//},
36+
//new FlyoutItem("ListView")
37+
//{
38+
// new ListViewPage()
39+
//},
40+
//new FlyoutItem("ListView Extended Test")
41+
//{
42+
// new ListViewExtendedTestPage()
43+
//},
44+
//new FlyoutItem("AnimationBasics")
45+
//{
46+
// new AnimationBasics()
47+
//},
48+
//new FlyoutItem("CardsAnimation")
49+
//{
50+
// new CardsAnimationPage()
51+
//},
52+
//new FlyoutItem("CanvasCardsAnimationPage")
53+
//{
54+
// new CanvasCardsAnimationPage()
55+
//},
56+
//new FlyoutItem("Image")
57+
//{
58+
// new ImagePage()
59+
//},
60+
//new FlyoutItem("AnimatedCollectionView")
61+
//{
62+
// new AnimatedCollectionViewPage()
63+
//},
64+
//new FlyoutItem("AnimationShowcase")
65+
//{
66+
// new AnimationShowcasePage()
67+
//},
68+
//new FlyoutItem("AnimationLoop")
69+
//{
70+
// new AnimationLoopPage()
71+
//},
72+
//new FlyoutItem("Navigation")
73+
//{
74+
// new NavigationMainPage()
75+
//},
76+
//new FlyoutItem("ElementRef")
77+
//{
78+
// new ElementRefPage()
79+
//},
80+
//new FlyoutItem("Canvas")
81+
//{
82+
// new CanvasPage()
83+
//},
84+
//new FlyoutItem("Landscape")
85+
//{
86+
// new LandscapePage()
87+
//},
88+
//new FlyoutItem("GraphicsView")
89+
//{
90+
// new GraphicsViewPage()
91+
//},
92+
//new FlyoutItem("RemainingItemsThreshold Test")
93+
//{
94+
// new RemainingItemsThresholdTestPage()
95+
//},
96+
//new FlyoutItem("AnimatedButtonPage")
97+
//{
98+
// new AnimatedButtonPage()
99+
//},
100+
//new FlyoutItem("Border Corner Radius Test")
101+
//{
102+
// new BorderCornerRadiusPage()
103+
//},
104+
//new FlyoutItem("Show Popup Test")
105+
//{
106+
// new ShowPopupTestPage()
107+
//},
108+
//new FlyoutItem("Carousel Test")
109+
//{
110+
// new CarouselTestPage()
111+
//},
112+
//new FlyoutItem("Carousel with Images Test")
113+
//{
114+
// new CarouselTestWithImagesPage()
115+
//},
116+
//new FlyoutItem("Canvas AutoV/HStack Test")
117+
//{
118+
// new CanvasAutoStackPage()
119+
//},
120+
//new FlyoutItem("Inline components")
121+
//{
122+
// new InlineComponentsPage()
123+
//},
124+
//new FlyoutItem("Collection View Grouped")
125+
//{
126+
// new CollectionViewExtendedTestPage()
127+
//},
128+
//new FlyoutItem("Drag & Drop")
129+
//{
130+
// new DragDropTestPage()
131+
//},
132132

133-
new FlyoutItem("Gradient Test")
134-
{
135-
new GradientPage()
136-
},
133+
//new FlyoutItem("Gradient Test")
134+
//{
135+
// new GradientPage()
136+
//},
137137

138-
new FlyoutItem("Behavior Test")
139-
{
140-
new BehaviorTestPage()
141-
},
138+
//new FlyoutItem("Behavior Test")
139+
//{
140+
// new BehaviorTestPage()
141+
//},
142142

143-
new FlyoutItem("Pickers Page")
144-
{
145-
new PickerPage()
146-
},
147-
new FlyoutItem("Visual State Test Page")
148-
{
149-
new VisualStateTestPage()
150-
},
151-
new FlyoutItem("FormattedText Test Page")
152-
{
153-
new FormattedTextTestPage()
154-
},
155-
new FlyoutItem("Theming Test Page")
156-
{
157-
new ThemeTestPage()
158-
},
159-
new FlyoutItem("CollectionView Multiple Selection Test Page")
160-
{
161-
new CollectionViewSelectionPage()
162-
},
163-
new FlyoutItem("Animating Label Test Page")
164-
{
165-
new AnimatingLabelTestPage()
166-
},
143+
//new FlyoutItem("Pickers Page")
144+
//{
145+
// new PickerPage()
146+
//},
147+
//new FlyoutItem("Visual State Test Page")
148+
//{
149+
// new VisualStateTestPage()
150+
//},
151+
//new FlyoutItem("FormattedText Test Page")
152+
//{
153+
// new FormattedTextTestPage()
154+
//},
155+
//new FlyoutItem("Theming Test Page")
156+
//{
157+
// new ThemeTestPage()
158+
//},
159+
//new FlyoutItem("CollectionView Multiple Selection Test Page")
160+
//{
161+
// new CollectionViewSelectionPage()
162+
//},
163+
//new FlyoutItem("Animating Label Test Page")
164+
//{
165+
// new AnimatingLabelTestPage()
166+
//},
167+
new FlyoutItem("Grid Test Page")
168+
{
169+
new GridPage()
170+
}
167171
}
168172
.ItemTemplate(RenderItemTemplate);
169173
}

‎samples/MauiReactor.TestApp/Pages/GridPage.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace MauiReactor.TestApp.Pages;
8+
9+
partial class GridPage : Component
10+
{
11+
public override VisualNode Render()
12+
{
13+
return ContentPage(
14+
15+
Grid("* *","* *",
16+
17+
Label("0 0")
18+
.Center(),
19+
20+
Label("0 1")
21+
.GridRow(1)
22+
.GridColumn(0)
23+
.Center(),
24+
25+
Label("1 0")
26+
.GridRow(0)
27+
.GridColumn(1)
28+
.Center(),
29+
30+
Label("1 1")
31+
.GridRow(1)
32+
.GridColumn(1)
33+
.Center()
34+
)
35+
.VCenter()
36+
);
37+
}
38+
}

‎src/MauiReactor/Grid.partial.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected override void OnUpdate()
5353
if (rowsOnNativeControl != thisAsIGrid.RowDefinitions)
5454
{
5555
GridExtensions.SetRowDefinitions(NativeControl, thisAsIGrid.RowDefinitions);
56-
NativeControl.SetValue(_mauiReactorGridColumns, thisAsIGrid.RowDefinitions);
56+
NativeControl.SetValue(_mauiReactorGridRows, thisAsIGrid.RowDefinitions);
5757
}
5858

5959
var columnsOnNativeControl = (string?)NativeControl.GetValue(_mauiReactorGridColumns);

0 commit comments

Comments
 (0)