Skip to content

Commit

Permalink
Limit Minimum Header Opacity
Browse files Browse the repository at this point in the history
Update selected interface after open the settings
  • Loading branch information
MoDevby committed Sep 10, 2018
1 parent 3cd0069 commit f0af21f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
13 changes: 8 additions & 5 deletions ResourcesWidget/MyWidget.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,29 @@
<SolidColorBrush Opacity="{Binding WindowOpacity,Mode=OneWay}" Color="{Binding WindowColor,Mode=OneWay}"/>
</Window.Background>

<DockPanel Margin="3,0">
<DockPanel>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" DockPanel.Dock="Top">
<Grid.Background>
<SolidColorBrush Opacity="{Binding HeaderOpacity,Mode=OneWay}" Color="{Binding WindowColor,Mode=OneWay}"/>
</Grid.Background>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<CheckBox HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0" IsChecked="{Binding AlwaysOnTop}" ToolTip="Always On Top"
HorizontalContentAlignment="Left"/>
HorizontalContentAlignment="Left" Margin="3,0"/>
<Button ToolTip="Settings" Click="Settings_Click" VerticalAlignment="Center" HorizontalAlignment="Stretch" Grid.Column="1"
Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalContentAlignment="Center">
Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalContentAlignment="Center" Margin="3,0">
<Image Source="/Images/SettingsIcon.png" Width="32"/>
</Button>
<Button ToolTip="Close" Click="Close_Click" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="2"
Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalContentAlignment="Right">
Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" HorizontalContentAlignment="Right" Margin="3,0">
<TextBlock Text="X" FontWeight="Bold" />
</Button>
</Grid>
<Separator HorizontalAlignment="Stretch" DockPanel.Dock="Top"/>
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
<Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom" Margin="3,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
Expand Down
8 changes: 6 additions & 2 deletions ResourcesWidget/MyWidget.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public decimal RamUsage

public double WindowOpacity
{ get { return Settings.Default.WindowOpacity; } }
public double HeaderOpacity { get { return WindowOpacity < 0.2 ? 0.2 : WindowOpacity; } }
public Color WindowColor
{ get { return Settings.Default.WindowColor; } }

Expand Down Expand Up @@ -343,9 +344,10 @@ private void CpuRamCalc()
RamUsage = computerInfo.TotalPhysicalMemory - computerInfo.AvailablePhysicalMemory;
}

private void UpdateColorsAndVis()
private void UpdateProperties()
{
OnPropertyChanged("WindowOpacity");
OnPropertyChanged("HeaderOpacity");
OnPropertyChanged("WindowColor");
OnPropertyChanged("TaskbarIcon");

Expand Down Expand Up @@ -379,6 +381,8 @@ private void UpdateColorsAndVis()
OnPropertyChanged("USpeedLableVisiblity");
OnPropertyChanged("CPULabelVisibility");
OnPropertyChanged("RamLableVisiblity");

OnPropertyChanged("SelectedInterface");
}
#endregion

Expand All @@ -396,8 +400,8 @@ private void Settings_Click(object sender, RoutedEventArgs e)
{
var settings = new SettingsWindow();
settings.ShowDialog();
UpdateColorsAndVis();
InitializeNetworkMeter();
UpdateProperties();
}
private void Window_MouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
{
Expand Down

0 comments on commit f0af21f

Please sign in to comment.