Skip to content

Commit 1405998

Browse files
marticlimentmarticliment
committed
Resizing improvements
1 parent a690ed7 commit 1405998

3 files changed

Lines changed: 98 additions & 102 deletions

File tree

‎src/UniGetUI/MainWindow.xaml.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public MainWindow()
6464
DismissableNotification.CloseButtonContent = CoreTools.Translate("Close");
6565

6666
ExtendsContentIntoTitleBar = true;
67-
// AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
67+
AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
6868
try
6969
{
7070
SetTitleBar(MainContentGrid);
@@ -989,9 +989,9 @@ private void TitleBar_OnBackRequested(TitleBar sender, object args)
989989
private string subtitleBackup = "";
990990
private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
991991
{
992-
if(TitleBar.ActualWidth <= 700)
992+
if(TitleBar.ActualWidth <= 750)
993993
{
994-
GlobalSearchBox.Width = Math.Max(50, 400 - (700 - TitleBar.ActualWidth));
994+
GlobalSearchBox.Width = Math.Max(50, 400 - (750 - TitleBar.ActualWidth));
995995
}
996996

997997
if (TitleBar.ActualWidth < 870 && titleCollapsed is not true)
@@ -1002,6 +1002,7 @@ private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
10021002
else if (TitleBar.ActualWidth > 870 && titleCollapsed is not false)
10031003
{
10041004
TitleBar.Title = "UniGetUI";
1005+
GlobalSearchBox.Width = 400;
10051006
titleCollapsed = false;
10061007
}
10071008

@@ -1014,6 +1015,7 @@ private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
10141015
else if (TitleBar.ActualWidth > 1200 && subtitleCollapsed is not false)
10151016
{
10161017
TitleBar.Subtitle = subtitleBackup;
1018+
GlobalSearchBox.Width = 400;
10171019
subtitleCollapsed = false;
10181020
}
10191021
// Debug.WriteLine(TitleBar.ActualWidth);

‎src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml‎

Lines changed: 71 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
NavigationCacheMode="Required"
1717
SizeChanged="ABSTRACT_PAGE_SizeChanged"
1818
mc:Ignorable="d">
19-
<!-- PreviewKeyDown="{x:Bind PackageList_PreviewKeyDown}" -->
2019

2120
<animations:Implicit.ShowAnimations>
2221
<animations:TranslationAnimation
@@ -477,7 +476,8 @@
477476
<Grid
478477
Name="MainHeader"
479478
Grid.Row="0"
480-
Grid.Column="1">
479+
Grid.Column="1"
480+
ColumnSpacing="8">
481481
<Grid.ColumnDefinitions>
482482
<ColumnDefinition Width="80" />
483483
<ColumnDefinition Width="*" />
@@ -493,6 +493,7 @@
493493
Grid.Column="0"
494494
Width="60"
495495
MinHeight="60"
496+
Margin="0,0,-8,0"
496497
FontSize="50"
497498
FontWeight="Normal" />
498499

@@ -521,105 +522,79 @@
521522
TextWrapping="Wrap" />
522523
</StackPanel>
523524

524-
<StackPanel
525+
<Grid
525526
Grid.Row="0"
526527
Grid.Column="2"
527-
Margin="0,0,4,0"
528-
HorizontalAlignment="Stretch"
529-
Orientation="Vertical"
530-
Spacing="8">
531-
532-
<Grid HorizontalAlignment="Stretch">
533-
<Grid.ColumnDefinitions>
534-
<ColumnDefinition Width="*" />
535-
<ColumnDefinition Width="Auto" />
536-
<ColumnDefinition Width="Auto" />
537-
</Grid.ColumnDefinitions>
538-
539-
540-
<!--TextBox
541-
x:Name="QueryBlock"
542-
Grid.Column="0"
543-
Height="30"
544-
Padding="7,5,5,5"
545-
VerticalContentAlignment="Center"
546-
x:FieldModifier="protected"
547-
CornerRadius="4,0,0,4" />
548-
549-
<Button
550-
x:Name="FindButton"
551-
Grid.Column="1"
552-
Width="32"
553-
Height="32"
554-
Padding="4"
555-
x:FieldModifier="protected"
556-
AutomationProperties.HelpText="Search"
557-
CornerRadius="0,4,4,0">
558-
<AnimatedIcon>
559-
<AnimatedIcon.Source>
560-
<animatedvisuals:AnimatedFindVisualSource />
561-
</AnimatedIcon.Source>
562-
<AnimatedIcon.FallbackIconSource>
563-
<SymbolIconSource Symbol="Find" />
564-
</AnimatedIcon.FallbackIconSource>
565-
</AnimatedIcon>
566-
</Button-->
567-
568-
<Button
569-
x:Name="ReloadButton"
570-
Grid.Column="2"
571-
Width="32"
572-
Height="32"
573-
Margin="6,0,0,0"
574-
Padding="0"
575-
x:FieldModifier="protected"
576-
AutomationProperties.HelpText="Reload packages"
577-
CornerRadius="4">
578-
<FontIcon FontSize="16" Glyph="&#xE72C;" />
579-
</Button>
580-
</Grid>
581-
528+
HorizontalAlignment="Right"
529+
VerticalAlignment="Center"
530+
ColumnSpacing="8"
531+
RowSpacing="8">
532+
<Grid.ColumnDefinitions>
533+
<ColumnDefinition Width="Auto" />
534+
<ColumnDefinition Width="Auto" />
535+
</Grid.ColumnDefinitions>
536+
<Grid.RowDefinitions>
537+
<RowDefinition Height="Auto" />
538+
<RowDefinition Height="Auto" />
539+
</Grid.RowDefinitions>
582540

583541
<StackPanel
584-
Name="SearchBoxPanel"
585-
HorizontalAlignment="Right"
586-
Orientation="Vertical"
587-
Spacing="8">
588-
589-
<StackPanel Orientation="Horizontal" Spacing="4">
590-
<widgets:TranslatedTextBlock VerticalAlignment="Center" Text="Order by:" />
591-
<DropDownButton x:Name="OrderByButton">
592-
<DropDownButton.Flyout>
593-
<widgets:BetterMenu Placement="Bottom">
594-
<widgets:BetterToggleMenuItem x:Name="OrderByName_Menu" Text="Name" />
595-
<widgets:BetterToggleMenuItem x:Name="OrderById_Menu" Text="Id" />
596-
<widgets:BetterToggleMenuItem x:Name="OrderByVer_Menu" Text="Version" />
597-
<widgets:BetterToggleMenuItem
598-
x:Name="OrderByNewVer_Menu"
599-
Text="New version"
600-
Visibility="{x:Bind RoleIsUpdateLike}" />
601-
<widgets:BetterToggleMenuItem x:Name="OrderBySrc_Menu" Text="Source" />
602-
<MenuFlyoutSeparator />
603-
<widgets:BetterToggleMenuItem x:Name="OrderAsc_Menu" Text="Ascendant" />
604-
<widgets:BetterToggleMenuItem x:Name="OrderDesc_Menu" Text="Descendant" />
605-
</widgets:BetterMenu>
606-
</DropDownButton.Flyout>
607-
</DropDownButton>
608-
</StackPanel>
609-
<StackPanel Orientation="Horizontal" Spacing="4">
610-
611-
<widgets:TranslatedTextBlock VerticalAlignment="Center" Text="View mode:" />
612-
<Toolkit:Segmented
613-
x:Name="ViewModeSelector"
614-
SelectionChanged="ViewModeSelector_SelectionChanged"
615-
SelectionMode="Single">
616-
<Toolkit:SegmentedItem x:Name="Selector_List" Icon="{ui:FontIcon Glyph=&#xE8FD;}" />
617-
<Toolkit:SegmentedItem x:Name="Selector_Grid" Icon="{ui:FontIcon Glyph=&#xF168;}" />
618-
<Toolkit:SegmentedItem x:Name="Selector_Icons" Icon="{ui:FontIcon Glyph=&#xF0E2;}" />
619-
</Toolkit:Segmented>
620-
</StackPanel>
542+
x:Name="OrderByContainer"
543+
Grid.Column="0"
544+
VerticalAlignment="Center"
545+
Orientation="Horizontal"
546+
Spacing="4">
547+
<widgets:TranslatedTextBlock VerticalAlignment="Center" Text="Order by:" />
548+
<DropDownButton x:Name="OrderByButton">
549+
<DropDownButton.Flyout>
550+
<widgets:BetterMenu Placement="Bottom">
551+
<widgets:BetterToggleMenuItem x:Name="OrderByName_Menu" Text="Name" />
552+
<widgets:BetterToggleMenuItem x:Name="OrderById_Menu" Text="Id" />
553+
<widgets:BetterToggleMenuItem x:Name="OrderByVer_Menu" Text="Version" />
554+
<widgets:BetterToggleMenuItem
555+
x:Name="OrderByNewVer_Menu"
556+
Text="New version"
557+
Visibility="{x:Bind RoleIsUpdateLike}" />
558+
<widgets:BetterToggleMenuItem x:Name="OrderBySrc_Menu" Text="Source" />
559+
<MenuFlyoutSeparator />
560+
<widgets:BetterToggleMenuItem x:Name="OrderAsc_Menu" Text="Ascendant" />
561+
<widgets:BetterToggleMenuItem x:Name="OrderDesc_Menu" Text="Descendant" />
562+
</widgets:BetterMenu>
563+
</DropDownButton.Flyout>
564+
</DropDownButton>
621565
</StackPanel>
622-
</StackPanel>
566+
<StackPanel
567+
x:Name="ViewModeContainer"
568+
Grid.Row="1"
569+
Grid.Column="0"
570+
Grid.ColumnSpan="2"
571+
VerticalAlignment="Center"
572+
Orientation="Horizontal"
573+
Spacing="4">
574+
<widgets:TranslatedTextBlock VerticalAlignment="Center" Text="View mode:" />
575+
<Toolkit:Segmented
576+
x:Name="ViewModeSelector"
577+
SelectionChanged="ViewModeSelector_SelectionChanged"
578+
SelectionMode="Single">
579+
<Toolkit:SegmentedItem x:Name="Selector_List" Icon="{ui:FontIcon Glyph=&#xE8FD;}" />
580+
<Toolkit:SegmentedItem x:Name="Selector_Grid" Icon="{ui:FontIcon Glyph=&#xF168;}" />
581+
<Toolkit:SegmentedItem x:Name="Selector_Icons" Icon="{ui:FontIcon Glyph=&#xF0E2;}" />
582+
</Toolkit:Segmented>
583+
</StackPanel>
584+
<Button
585+
x:Name="ReloadButton"
586+
Grid.Column="1"
587+
Width="32"
588+
Height="32"
589+
Padding="0"
590+
HorizontalAlignment="Right"
591+
VerticalAlignment="Center"
592+
x:FieldModifier="protected"
593+
AutomationProperties.HelpText="Reload packages"
594+
CornerRadius="4">
595+
<FontIcon FontSize="16" Glyph="&#xE72C;" />
596+
</Button>
597+
</Grid>
623598

624599
<Grid
625600
Grid.Row="3"

‎src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,21 +1325,40 @@ private void ContextMenuButton_Tapped(object sender, TappedRoutedEventArgs e)
13251325
}
13261326

13271327
private bool? _pageIsWide;
1328+
private bool? _titleHidden;
13281329
private void ABSTRACT_PAGE_SizeChanged(object sender, SizeChangedEventArgs e)
13291330
{
1330-
if(ActualWidth < 700)
1331+
if (ActualWidth < 500)
1332+
{
1333+
if (_titleHidden != false)
1334+
{
1335+
_titleHidden = false;
1336+
MainSubtitle.Visibility = Visibility.Collapsed;
1337+
}
1338+
}
1339+
else
1340+
{
1341+
if (_titleHidden != true)
1342+
{
1343+
_titleHidden = true;
1344+
MainSubtitle.Visibility = Visibility.Visible;
1345+
1346+
}
1347+
}
1348+
1349+
if (ActualWidth < 700)
13311350
{
13321351
if (_pageIsWide != false)
13331352
{
1334-
SearchBoxPanel.Orientation = Orientation.Vertical;
13351353
_pageIsWide = false;
1354+
MainTitle.FontSize = 20;
13361355
}
13371356
}
13381357
else
13391358
{
13401359
if (_pageIsWide != true)
13411360
{
1342-
SearchBoxPanel.Orientation = Orientation.Horizontal;
1361+
MainTitle.FontSize = 30;
13431362
_pageIsWide = true;
13441363
}
13451364
}

0 commit comments

Comments
 (0)