-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FancyZones editor display zone numbers & PowerRename fix (#1726)
* Fix for issue #1218 Design Change: Default Enter Action * Fix for issue #1085 * change zone's number color and font remove the light blue background * Fix for disappearing zone number in editor * Grid layout reversed order fix Co-authored-by: sqrlmn <sqrlmn@users.noreply.github.com> Co-authored-by: Enrico Giordani <enrico.giordani@gmail.com>
- Loading branch information
1 parent
0aeecc7
commit f9a756d
Showing
8 changed files
with
88 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 36 additions & 20 deletions
56
src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 27 additions & 13 deletions
40
src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,31 @@ | ||
<UserControl x:Class="FancyZonesEditor.GridZone" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
xmlns:local="clr-namespace:FancyZonesEditor" | ||
mc:Ignorable="d" | ||
Background="LightGray" | ||
BorderThickness="1" | ||
BorderBrush="DarkGray" | ||
Opacity="0.5" | ||
d:DesignHeight="450" d:DesignWidth="800"> | ||
<Grid x:Name="Frame" Visibility="Collapsed"> | ||
<UserControl | ||
x:Class="FancyZonesEditor.GridZone" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
xmlns:local="clr-namespace:FancyZonesEditor" | ||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
d:DesignHeight="450" | ||
d:DesignWidth="800" | ||
Background="LightGray" | ||
BorderBrush="DarkGray" | ||
BorderThickness="1" | ||
Opacity="0.5" | ||
mc:Ignorable="d"> | ||
<Grid x:Name="Frame"> | ||
<Canvas x:Name="Body" /> | ||
<Label | ||
Name="LabelID" | ||
Grid.Row="3" | ||
Grid.Column="2" | ||
Canvas.Left="10" | ||
Canvas.Bottom="10" | ||
HorizontalContentAlignment="Center" | ||
VerticalContentAlignment="Center" | ||
Content="ID" | ||
FontFamily="Segoe UI" | ||
FontSize="80" | ||
Foreground="Black" /> | ||
<!--<TextBlock Margin="2" Text="Shift Key switches direction Ctrl Key repeats"/>--> | ||
</Grid> | ||
</UserControl> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters