- tweak: style thinks
This commit is contained in:
@@ -107,10 +107,10 @@
|
||||
pages|StringUnitConfigControl.ConfigBorder,
|
||||
pages|IntUnitConfigControl.ConfigBorder,
|
||||
pages|FloatUnitConfigControl.ConfigBorder">
|
||||
<Setter Property="Background" Value="#333333" />
|
||||
<Setter Property="CornerRadius" Value="5"/>
|
||||
<Setter Property="BorderThickness" Value="1,0,1,2" />
|
||||
<Setter Property="BorderBrush" Value="Azure" />
|
||||
<Setter Property="Background" Value="#33333355" />
|
||||
<Setter Property="CornerRadius" Value="0"/>
|
||||
<Setter Property="BorderThickness" Value="1,0,0,2" />
|
||||
<Setter Property="BorderBrush" Value="#3f3f3f5f" />
|
||||
</Style>
|
||||
|
||||
</Styles>
|
||||
@@ -45,6 +45,7 @@ filter-roleplay = Roleplay
|
||||
filter-language = Language
|
||||
favorite-add = Add to favorites
|
||||
servername-set = Set server name
|
||||
servername-clear = Clear server name
|
||||
twofa-enabled = You have two-factor authentication enabled. Please enter the code.
|
||||
twofa-set = Proceed
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@ filter-roleplay = Ролевая игра
|
||||
filter-language = Язык
|
||||
favorite-add = Добавить в избранное
|
||||
servername-set = Установить имя сервера
|
||||
servername-clear = Очистить
|
||||
twofa-enabled = У вас включена двухфакторная аутентификация. Введите код.
|
||||
twofa-set = Продолжить
|
||||
|
||||
|
||||
@@ -28,8 +28,7 @@ public partial class ServerOverviewModel : ViewModelBase
|
||||
[ObservableProperty] private ServerListView _currentServerList = new();
|
||||
|
||||
public readonly ServerFilter CurrentFilter = new();
|
||||
|
||||
public Action? OnSearchChange;
|
||||
|
||||
[GenerateProperty] private IServiceProvider ServiceProvider { get; }
|
||||
[GenerateProperty] private ConfigurationService ConfigurationService { get; }
|
||||
[GenerateProperty] private FavoriteServerListProvider FavoriteServerListProvider { get; }
|
||||
@@ -71,13 +70,11 @@ public partial class ServerOverviewModel : ViewModelBase
|
||||
Items = new ObservableCollection<ServerListTabTemplate>(tempItems);
|
||||
|
||||
SelectedItem = Items[0];
|
||||
|
||||
OnSearchChange += SearchChangeEvent;
|
||||
}
|
||||
|
||||
private void SearchChangeEvent()
|
||||
partial void OnSearchTextChanged(string value)
|
||||
{
|
||||
CurrentFilter.SearchText = SearchText;
|
||||
CurrentFilter.SearchText = value;
|
||||
ApplyFilter();
|
||||
}
|
||||
|
||||
|
||||
@@ -24,8 +24,7 @@ public sealed partial class EditServerNameViewModel : PopupViewModelBase
|
||||
|
||||
if (string.IsNullOrWhiteSpace(NameInput))
|
||||
{
|
||||
RemoveServerName();
|
||||
Dispose();
|
||||
OnClear();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -33,6 +32,12 @@ public sealed partial class EditServerNameViewModel : PopupViewModelBase
|
||||
Dispose();
|
||||
}
|
||||
|
||||
public void OnClear()
|
||||
{
|
||||
RemoveServerName();
|
||||
Dispose();
|
||||
}
|
||||
|
||||
private void AddServerName()
|
||||
{
|
||||
var currentNames = ConfigurationService.GetConfigValue(LauncherConVar.ServerCustomNames)!;
|
||||
|
||||
@@ -71,7 +71,6 @@
|
||||
<TextBox
|
||||
Margin="25,0,0,0"
|
||||
Text="{Binding SearchText}"
|
||||
TextChanged="TextBox_OnTextChanged"
|
||||
VerticalAlignment="Center"
|
||||
Watermark="{services:LocaledText 'server-search'}" />
|
||||
<Button
|
||||
|
||||
@@ -26,10 +26,4 @@ public partial class ServerOverviewView : UserControl
|
||||
{
|
||||
DataContext = viewModel;
|
||||
}
|
||||
|
||||
private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
|
||||
{
|
||||
var context = (ServerOverviewModel?)DataContext;
|
||||
context?.OnSearchChange?.Invoke();
|
||||
}
|
||||
}
|
||||
@@ -23,5 +23,10 @@
|
||||
<customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="servername-set"/>
|
||||
</Button>
|
||||
</Border>
|
||||
<Border Background="{StaticResource DefaultSelected}" BoxShadow="{StaticResource DefaultShadow}">
|
||||
<Button Command="{Binding OnClear}" HorizontalAlignment="Stretch">
|
||||
<customControls:LocalizedLabel HorizontalAlignment="Center" LocalId="servername-clear"/>
|
||||
</Button>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
|
||||
Reference in New Issue
Block a user