Skip to content

Commit 196a840

Browse files
committed
Use auto height row & auto width column
1 parent f283105 commit 196a840

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ public void Save()
114114
return null;
115115
}
116116

117-
// Create main grid
117+
// Create main grid with two columns
118118
var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
119119
mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
120120
{
121-
Width = new GridLength(70, GridUnitType.Star) // TODO: Auto
121+
Width = new GridLength(0, GridUnitType.Auto)
122122
});
123123
mainPanel.ColumnDefinitions.Add(new ColumnDefinition()
124124
{
125-
Width = new GridLength(30, GridUnitType.Star) // TODO: Auto
125+
Width = new GridLength(0, GridUnitType.Auto)
126126
});
127127

128128
// Iterate over each setting and create one row for it
@@ -136,7 +136,10 @@ public void Save()
136136
}
137137

138138
// Add a new row to the main grid
139-
mainPanel.RowDefinitions.Add(new RowDefinition());
139+
mainPanel.RowDefinitions.Add(new RowDefinition()
140+
{
141+
Height = new GridLength(0, GridUnitType.Auto)
142+
});
140143

141144
// State controls for column 0 and 1
142145
StackPanel? panel = null;
@@ -357,11 +360,10 @@ Settings[attributes.Name] is bool isChecked
357360
var linkbtn = new System.Windows.Controls.Button
358361
{
359362
HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
360-
Margin = settingControlMargin
363+
Margin = settingControlMargin,
364+
Content = attributes.urlLabel
361365
};
362366

363-
linkbtn.Content = attributes.urlLabel;
364-
365367
contentControl = linkbtn;
366368

367369
break;

0 commit comments

Comments
 (0)