Skip to content

Portable Tool for an Ideal Windows Setup

-changes to the appearance of the textbox -fixed false notification

Greedeksc388d356ee30
diff --git a/.Source/GTweak/Styles/TextBox.xaml b/.Source/GTweak/Styles/TextBox.xaml
index c03da461..9cb9b3d3 100644
--- a/.Source/GTweak/Styles/TextBox.xaml
+++ b/.Source/GTweak/Styles/TextBox.xaml
@@ -20,7 +20,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Grid>
- <Border Background="Transparent" BorderBrush="{StaticResource Color_Accent}" BorderThickness="1" CornerRadius="3"/>
+ <Border x:Name="border" Background="{StaticResource Color_Background_Dark}" BorderBrush="{StaticResource Color_Accent}" BorderThickness="0,0,0,1" CornerRadius="5"/>
<ScrollViewer x:Name="PART_ContentHost" Margin="5,0,0,0" VerticalAlignment="Center" />
<Label Margin="5,0,0,0" x:Name="WaterMarkLabel" Content="{TemplateBinding Tag}" VerticalAlignment="Center"
Visibility="Collapsed" Foreground="#BFBFBF" FontFamily="{StaticResource Jura}"/>
@@ -34,12 +34,15 @@
</MultiTrigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="White"/>
+ <Setter Property="BorderBrush" Value="#d1dbe4" TargetName="border"/>
</Trigger>
<Trigger Property="IsFocused" Value="False">
<Setter Property="Text" Value=""/>
+ <Setter Property="BorderBrush" Value="#d1dbe4" TargetName="border"/>
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="False">
<Setter Property="Text" Value=""/>
+ <Setter Property="BorderBrush" Value="#d1dbe4" TargetName="border"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml.cs b/.Source/GTweak/Windows/ImportWindow.xaml.cs
index bed22a2f..1cf6bb61 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml.cs
+++ b/.Source/GTweak/Windows/ImportWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace GTweak.Windows
public partial class ImportWindow : Window
{
- private byte restartNeed = 0, logoutNeed = 0;
+ private bool isRestartNeed = false, isLogoutNeed = false;
private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
public ImportWindow()
{
@@ -34,9 +34,9 @@ namespace GTweak.Windows
{
if (_valueProgress == 100)
{
- if (restartNeed>0)
+ if (isRestartNeed)
new ViewNotification().Show("restart");
- else if (restartNeed == 0 && logoutNeed > 0)
+ else if (!isRestartNeed && isLogoutNeed)
new ViewNotification().Show("logout");
App.UpdateImport();
Close();
@@ -63,7 +63,7 @@ namespace GTweak.Windows
{
case 8:
case 15:
- restartNeed++;
+ isRestartNeed = true;
break;
}
}
@@ -92,10 +92,10 @@ namespace GTweak.Windows
case 12:
case 26:
case 27:
- logoutNeed++;
+ isLogoutNeed = true;
break;
case 22:
- restartNeed++;
+ isRestartNeed = true;
break;
}
}
@@ -111,10 +111,9 @@ namespace GTweak.Windows
{
await Task.Delay(700);
Parallel.Invoke(() => ServicesTweaks.UseServices("TglButton" + number, Convert.ToBoolean(value)));
+ isRestartNeed = true;
}
}
-
- restartNeed++;
}
if (i == 80)
@@ -154,10 +153,10 @@ namespace GTweak.Windows
case 14:
case 15:
case 20:
- restartNeed++;
+ isRestartNeed = true;
break;
case 2:
- logoutNeed++;
+ isLogoutNeed = true;
break;
}
}