|
19 | 19 | <converters:BooleanToVisibilityCollapsedConverter x:Key="BoolToVisibilityCollapsed" /> |
20 | 20 | </UserControl.Resources> |
21 | 21 |
|
22 | | - <!-- Rounded on top only and no bottom border: the preview graph sits flush underneath (its top border is |
| 22 | + <!-- Rounded on the upper left only, no bottom border: the module settings column sits flush on the right |
| 23 | + (this box's right border is that divider) and the preview graph sits flush underneath (its top border is |
23 | 24 | the 2px divider between them), so the two boxes read as one view. --> |
24 | 25 | <Border BorderThickness="2,2,2,0" |
25 | 26 | BorderBrush="{DynamicResource Brush.Border.Normal}" |
26 | 27 | Background="{DynamicResource Brush.Background.Popup}" |
27 | | - CornerRadius="5,5,0,0" |
| 28 | + CornerRadius="5,0,0,0" |
28 | 29 | ClipToBounds="True"> |
29 | 30 |
|
30 | 31 | <Grid> |
|
262 | 263 |
|
263 | 264 | <!-- canvas tools (pinned to the corner, outside the panned canvas): add module + remove selected module |
264 | 265 | + snap-to-grid toggle + auto layout --> |
265 | | - <StackPanel Orientation="Horizontal" |
266 | | - HorizontalAlignment="Right" |
267 | | - VerticalAlignment="Top" |
268 | | - Margin="0,8,8,0" |
269 | | - Panel.ZIndex="1"> |
270 | | - |
271 | | - <local:MairaButton x:Name="AddModule_MairaButton" |
272 | | - Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/plus.png" |
273 | | - IsSmall="True" |
274 | | - Click="AddModule_MairaButton_Click" /> |
275 | | - |
276 | | - <local:MairaButton x:Name="RemoveModule_MairaButton" |
277 | | - Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/minus.png" |
278 | | - IsSmall="True" |
279 | | - Margin="8,0,0,0" |
280 | | - Click="RemoveModule_MairaButton_Click" /> |
281 | | - |
282 | | - <local:MairaButton x:Name="SnapToGrid_MairaButton" |
283 | | - Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/grid.png" |
284 | | - IsSmall="True" |
285 | | - Margin="8,0,0,0" |
286 | | - Click="SnapToGrid_MairaButton_Click" /> |
287 | | - |
288 | | - <local:MairaButton x:Name="AutoLayout_MairaButton" |
289 | | - Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/wand.png" |
290 | | - IsSmall="True" |
291 | | - Margin="8,0,0,0" |
292 | | - Click="AutoLayout_MairaButton_Click" /> |
293 | | - |
294 | | - </StackPanel> |
| 266 | + <Border HorizontalAlignment="Right" |
| 267 | + VerticalAlignment="Top" |
| 268 | + Margin="0,8,8,0" |
| 269 | + Panel.ZIndex="1" |
| 270 | + Background="{DynamicResource Brush.Background.Default}" |
| 271 | + CornerRadius="20" |
| 272 | + Padding="6"> |
| 273 | + |
| 274 | + <!-- the rounded plate above is opaque (page background color) so the buttons stay readable |
| 275 | + over whatever nodes are underneath --> |
| 276 | + <StackPanel Orientation="Horizontal"> |
| 277 | + |
| 278 | + <local:MairaButton x:Name="AddModule_MairaButton" |
| 279 | + Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/plus.png" |
| 280 | + IsSmall="True" |
| 281 | + Click="AddModule_MairaButton_Click" /> |
| 282 | + |
| 283 | + <local:MairaButton x:Name="RemoveModule_MairaButton" |
| 284 | + Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/minus.png" |
| 285 | + IsSmall="True" |
| 286 | + Margin="8,0,0,0" |
| 287 | + Click="RemoveModule_MairaButton_Click" /> |
| 288 | + |
| 289 | + <local:MairaButton x:Name="SnapToGrid_MairaButton" |
| 290 | + Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/grid.png" |
| 291 | + IsSmall="True" |
| 292 | + Margin="8,0,0,0" |
| 293 | + Click="SnapToGrid_MairaButton_Click" /> |
| 294 | + |
| 295 | + <local:MairaButton x:Name="AutoLayout_MairaButton" |
| 296 | + Icon="/MarvinsAIRARefactored;component/Artwork/Buttons/wand.png" |
| 297 | + IsSmall="True" |
| 298 | + Margin="8,0,0,0" |
| 299 | + Click="AutoLayout_MairaButton_Click" /> |
| 300 | + |
| 301 | + </StackPanel> |
| 302 | + |
| 303 | + </Border> |
295 | 304 |
|
296 | 305 | </Grid> |
297 | 306 |
|
|
0 commit comments