Skip to content

Commit 72a0a14

Browse files
jmcouffinjmcouffin
authored
Merge pull request #2939 from Wurschdhaud/enhancement-sb-nav-align
Enhancements to SB Navigator
2 parents 56b1c6e + 78cb259 commit 72a0a14

File tree

3 files changed

+493
-309
lines changed

3 files changed

+493
-309
lines changed

‎extensions/pyRevitTools.extension/pyRevit.tab/Modify.panel/3D.pulldown/Section Box Navigator.pushbutton/SectionBoxNavigator.xaml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
Title="Section Box Navigator" Height="635" Width="560"
3+
Title="Section Box Navigator" Height="670" Width="560"
44
ShowInTaskbar="False" Topmost="True"
55
ScrollViewer.VerticalScrollBarVisibility="Disabled">
66
<Window.Resources>
@@ -86,26 +86,26 @@
8686
<!-- Top Controls -->
8787
<Button Content="Top ↑" Grid.Row="0" Grid.Column="0"
8888
Height="30" Margin="2" Click="btn_top_up_click" Tag="top-up"
89-
MouseEnter="btn_preview_level_box_enter" MouseLeave="btn_preview_leave"/>
89+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
9090
<Button Content="Top ↓" Grid.Row="0" Grid.Column="1"
9191
Height="30" Margin="2" Click="btn_top_down_click" Tag="top-down"
92-
MouseEnter="btn_preview_level_box_enter" MouseLeave="btn_preview_leave"/>
92+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
9393

9494
<!-- Bottom Controls -->
9595
<Button Content="Bottom ↑" Grid.Row="1" Grid.Column="0"
9696
Height="30" Margin="2" Click="btn_bottom_up_click" Tag="bottom-up"
97-
MouseEnter="btn_preview_level_box_enter" MouseLeave="btn_preview_leave"/>
97+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
9898
<Button Content="Bottom ↓" Grid.Row="1" Grid.Column="1"
9999
Height="30" Margin="2" Click="btn_bottom_down_click" Tag="bottom-down"
100-
MouseEnter="btn_preview_level_box_enter" MouseLeave="btn_preview_leave"/>
100+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
101101

102102
<!-- Box Navigation -->
103103
<Button Content="Box ↑" Grid.Row="2" Grid.Column="0"
104104
Height="30" Margin="2" Click="btn_box_up_click" Tag="box-up"
105-
MouseEnter="btn_preview_level_box_enter" MouseLeave="btn_preview_leave"/>
105+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
106106
<Button Content="Box ↓" Grid.Row="2" Grid.Column="1"
107107
Height="30" Margin="2" Click="btn_box_down_click" Tag="box-down"
108-
MouseEnter="btn_preview_level_box_enter" MouseLeave="btn_preview_leave"/>
108+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
109109
</Grid>
110110

111111
<!-- Mode Selection Radio Buttons -->
@@ -181,16 +181,16 @@
181181
<!-- Top Row: W, N, S, E outward buttons -->
182182
<Button Content="← W" Grid.Row="0" Grid.Column="1"
183183
Height="30" Margin="1" Click="btn_grid_west_out_click" Tag="west-out"
184-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
184+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
185185
<Button Content="↑ N" Grid.Row="0" Grid.Column="2"
186186
Height="30" Margin="1" Click="btn_grid_north_out_click" Tag="north-out"
187-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
187+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
188188
<Button Content="↓ S" Grid.Row="0" Grid.Column="3"
189189
Height="30" Margin="1" Click="btn_grid_south_out_click" Tag="south-out"
190-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
190+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
191191
<Button Content="→ E" Grid.Row="0" Grid.Column="4"
192192
Height="30" Margin="1" Click="btn_grid_east_out_click" Tag="east-out"
193-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
193+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
194194

195195
<TextBlock Text="Smaller"
196196
Grid.Row="1" Grid.Column="0"
@@ -199,16 +199,16 @@
199199
<!-- Bottom Row: W, N, S, E inward buttons -->
200200
<Button Content="→ W" Grid.Row="1" Grid.Column="1"
201201
Height="30" Margin="1" Click="btn_grid_west_in_click" Tag="west-in"
202-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
202+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
203203
<Button Content="↓ N" Grid.Row="1" Grid.Column="2"
204204
Height="30" Margin="1" Click="btn_grid_north_in_click" Tag="north-in"
205-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
205+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
206206
<Button Content="↑ S" Grid.Row="1" Grid.Column="3"
207207
Height="30" Margin="1" Click="btn_grid_south_in_click" Tag="south-in"
208-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
208+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
209209
<Button Content="← E" Grid.Row="1" Grid.Column="4"
210210
Height="30" Margin="1" Click="btn_grid_east_in_click" Tag="east-in"
211-
MouseEnter="btn_preview_grid_enter" MouseLeave="btn_preview_leave"/>
211+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
212212
</Grid>
213213

214214
<!-- Mode Selection Radio Buttons -->
@@ -268,11 +268,11 @@
268268

269269
<!-- Buttons -->
270270
<Button Content="Expand +" Grid.Row="0" Grid.Column="0"
271-
Height="30" Margin="2" Click="btn_expansion_top_up_click"
272-
MouseEnter="btn_preview_expansion_enter" MouseLeave="btn_preview_leave"/>
271+
Height="30" Margin="2" Click="btn_expansion_top_up_click" Tag="expand"
272+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
273273
<Button Content="Shrink -" Grid.Row="0" Grid.Column="1"
274-
Height="30" Margin="2" Click="btn_expansion_top_down_click"
275-
MouseEnter="btn_preview_expansion_enter" MouseLeave="btn_preview_leave"/>
274+
Height="30" Margin="2" Click="btn_expansion_top_down_click" Tag="shrink"
275+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
276276
</Grid>
277277
</StackPanel>
278278
</GroupBox>
@@ -285,8 +285,8 @@
285285
</GroupBox.Header>
286286
<UniformGrid Columns="3" Margin="5,0,5,2" HorizontalAlignment="Stretch">
287287
<Button x:Name="btnToggleBox" Content="Toggle Box"
288-
Margin="2" Click="btn_toggle_box_click"
289-
MouseEnter="btn_preview_toggle_enter" MouseLeave="btn_preview_leave"/>
288+
Margin="2" Click="btn_toggle_box_click" Tag="toggle"
289+
MouseEnter="btn_preview_enter" MouseLeave="btn_preview_leave"/>
290290
<Button x:Name="btnHideBox" Content="(Un-)Hide Box"
291291
Margin="2" Click="btn_hide_box_click"/>
292292
<Button x:Name="btnAlignBoxToFace" Content="Align Box"
@@ -308,10 +308,14 @@
308308
</Grid.RowDefinitions>
309309
<StackPanel Grid.Row="0">
310310
<TextBlock x:Name="project_unit_text" Text="" Visibility="Collapsed" Foreground="Red" FontWeight="Bold" Margin="0,5,0,2"/>
311-
<TextBlock x:Name="txtTopLevel" Text="Top: Loading..." Margin="0,2"/>
312-
<TextBlock x:Name="txtTopPosition" Text="Position: ..." Margin="0,2"/>
313-
<TextBlock x:Name="txtBottomLevel" Text="Bottom: Loading..." Margin="0,2"/>
314-
<TextBlock x:Name="txtBottomPosition" Text="Position: ..." Margin="0,2"/>
311+
<TextBlock x:Name="txtTopLevelAbove" Text="Top: Loading..." Margin="0,2" FontSize="10"/>
312+
<TextBlock x:Name="txtTopPosition" Text="Position: ..." Margin="0,2" Foreground="DarkBlue"/>
313+
<TextBlock x:Name="txtTopLevelBelow" Text="Top: Loading..." Margin="0,2" FontSize="10"/>
314+
<Separator Margin="0,2" />
315+
<TextBlock x:Name="txtBottomLevelAbove" Text="Bottom: Loading..." Margin="0,2" FontSize="10"/>
316+
<TextBlock x:Name="txtBottomPosition" Text="Position: ..." Margin="0,2" Foreground="DarkBlue"/>
317+
<TextBlock x:Name="txtBottomLevelBelow" Text="Bottom: Loading..." Margin="0,2" FontSize="10"/>
318+
<Separator Margin="0,2" />
315319
<TextBlock x:Name="txtVerticalStatus" Text="" Margin="0,5,0,0" TextWrapping="Wrap" Foreground="Black"/>
316320
</StackPanel>
317321
</Grid>

0 commit comments

Comments
 (0)