Skip to content

Commit 39eecd6

Browse files
committed
ux: allows users to adjust the height of the commit message input box (sourcegit-scm#201)
1 parent 907e009 commit 39eecd6

File tree

2 files changed

+22
-35
lines changed

2 files changed

+22
-35
lines changed

src/Views/Preference.axaml

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,23 @@
8787
</ComboBox>
8888

8989
<TextBlock Grid.Row="2" Grid.Column="0"
90+
Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
91+
HorizontalAlignment="Right"
92+
Margin="0,0,16,0"/>
93+
<NumericUpDown Grid.Row="2" Grid.Column="1"
94+
Minimum="50" Maximum="1000" Increment="1"
95+
Height="28"
96+
Padding="4"
97+
ShowButtonSpinner="False"
98+
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
99+
CornerRadius="3"
100+
Value="{Binding SubjectGuideLength, Mode=TwoWay}"/>
101+
102+
<TextBlock Grid.Row="3" Grid.Column="0"
90103
Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
91104
HorizontalAlignment="Right"
92105
Margin="0,0,16,0"/>
93-
<Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,64">
106+
<Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
94107
<Slider Grid.Column="0"
95108
Minimum="20000" Maximum="100000"
96109
TickPlacement="BottomRight" TickFrequency="5000"
@@ -113,34 +126,6 @@
113126
Foreground="{DynamicResource Brush.FG1}"
114127
Text="{Binding MaxHistoryCommits}"/>
115128
</Grid>
116-
117-
<TextBlock Grid.Row="3" Grid.Column="0"
118-
Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
119-
HorizontalAlignment="Right"
120-
Margin="0,0,16,0"/>
121-
<Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
122-
<Slider Grid.Column="0"
123-
Minimum="50" Maximum="250"
124-
TickPlacement="BottomRight" TickFrequency="4"
125-
IsSnapToTickEnabled="False"
126-
VerticalAlignment="Center"
127-
Foreground="{DynamicResource Brush.Border1}"
128-
Value="{Binding SubjectGuideLength, Mode=TwoWay}">
129-
<Slider.Resources>
130-
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
131-
<GridLength x:Key="SliderPreContentMargin">0</GridLength>
132-
<GridLength x:Key="SliderPostContentMargin">0</GridLength>
133-
<CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
134-
<x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
135-
<x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
136-
</Slider.Resources>
137-
</Slider>
138-
139-
<TextBlock Grid.Column="1"
140-
HorizontalAlignment="Right" VerticalAlignment="Center"
141-
Foreground="{DynamicResource Brush.FG1}"
142-
Text="{Binding SubjectGuideLength}"/>
143-
</Grid>
144129

145130
<CheckBox Grid.Row="4" Grid.Column="1"
146131
Content="{DynamicResource Text.Preference.General.RestoreTabs}"

src/Views/WorkingCopy.axaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
BorderBrush="{DynamicResource Brush.Border0}"/>
118118

119119
<!-- Right -->
120-
<Grid Grid.Column="2" Margin="0,4,4,4" RowDefinitions="*,Auto,32">
120+
<Grid Grid.Column="2" Margin="0,4,4,4" RowDefinitions="*,4,128,36">
121121
<!-- Select Change Detail -->
122122
<Grid Grid.Row="0">
123123
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
@@ -158,14 +158,16 @@
158158
</ContentControl>
159159
</Grid>
160160

161+
<!-- Splitter -->
162+
<GridSplitter Grid.Row="1" MinHeight="1"
163+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
164+
Background="Transparent"/>
165+
161166
<!-- Commit Message -->
162-
<v:CommitMessageTextBox Grid.Row="1"
163-
Height="100"
164-
Margin="0,4"
165-
Text="{Binding CommitMessage, Mode=TwoWay}"/>
167+
<v:CommitMessageTextBox Grid.Row="2" Text="{Binding CommitMessage, Mode=TwoWay}"/>
166168

167169
<!-- Commit Options -->
168-
<Grid Grid.Row="2" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
170+
<Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
169171
<Button Grid.Column="0"
170172
Classes="icon_button"
171173
Width="14" Height="14"

0 commit comments

Comments
 (0)