Resizable Window + Customize #2699

onesounds · 2024-05-17T02:36:16Z

What's the PR

Resizable Window

Solved Maximum window width size #1820 Let the user drag and adjust the size of FL window (and also the preview panel partition) #1799
You can adjust the width and width of the window with the mouse like normal window.
When the height is minimized, the height is readjusted based on two results.
Changed window size and number of items are automatically saved and loaded; retained when opening the next window.
Can be used the old way if user want. (Fixed Height) it moved to theme from general page.

Customize

Solved Allow user to change font size to better fit there preference #2632 [Adjust the height of the input box.] #2296 [Enhancement][Appearance] Individual Font/FontWeight for Item Subtitles #2041
You can view the preview in the preview area and adjust the detailed font and size.
You can ignore the theme properties and set the window height and detail fonts.
- Added Window Height, Query Font Size, Subtitle Font size and weight settings.

Todo

Reset
~~- [ ] Get Preset from Theme~~
- I decided to leave it out because it was overkill. Expected to be too burdensome to manage in the future..
Adjusting the Theme Editor Area Size
Import to Split Setting Window
Remove existing settings (number of results, window width, font settings)

ETC

Fix Navigation Sidebar Color in this PR
This PR is fine on its own, but there are things to work on in a separate PR.
- Adjust Item Spacing
- Adjust Themes

Test Cases

The window should be resizable with the mouse and should work when turned off and on.
Adjustable items in the Customize menu should be preserved after relaunch.
If the Keep Height menu is enabled, the vertical height (number of items) should be maintained regardless of screen resizing.
The reset button should work.

- Add Subtitle font style combobox

- Fix Conflict

onesounds · 2024-05-25T07:21:19Z

Flow.Launcher.Core/Resource/Theme.cs

@@ -189,9 +187,25 @@ public ResourceDictionary GetResourceDictionary(string theme)

                Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
                Array.ForEach(
-                    new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 
+                    new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 


Separating / And adding Subtitle Styles.

onesounds · 2024-05-25T07:21:35Z

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -56,6 +56,13 @@ public string Theme
            }
        }
        public bool UseDropShadowEffect { get; set; } = false;
+
+        /* Appearance Settings. It should be separated from the setting later.*/


Settings for Customize

onesounds · 2024-05-25T07:22:46Z

Flow.Launcher/MainWindow.xaml.cs

+        {
+
+        }
+        private void OnResizeEnd()


Adjusts the total number of items based on the height at the time the window is resized.

onesounds · 2024-05-25T07:23:07Z

Flow.Launcher/MainWindow.xaml.cs

+
+            if (System.Convert.ToInt32((Height - (_settings.WindowHeightSize + 14) - shadowMargin) / _settings.ItemHeightSize) < 1)
+            {
+                _settings.MaxResultsToShow = 2;


If the window height is too low, it will rescale the height based on 2 criteria.

Adjust Item Position

onesounds · 2024-05-26T21:50:49Z

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

+    private void Reset_Click(object sender, System.Windows.RoutedEventArgs e)
+    {
+        /*The FamilyTypeface should initialize all of its various properties.*/
+        FamilyTypeface targetTypeface = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
+
+        QueryBoxFontSize.Value = 20;
+        QueryBoxFontComboBox.SelectedIndex = SearchFontIndex("Segoe UI", QueryBoxFontComboBox);
+        QueryBoxFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, QueryBoxFontStyleComboBox);
+
+        ResultItemFontComboBox.SelectedIndex = SearchFontIndex("Segoe UI", ResultItemFontComboBox);
+        ResultItemFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, ResultItemFontStyleComboBox);
+        ResultItemFontSize.Value = 16;
+
+        ResultSubItemFontComboBox.SelectedIndex = SearchFontIndex("Segoe UI", ResultSubItemFontComboBox);
+        ResultSubItemFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, ResultSubItemFontStyleComboBox);
+        ResultSubItemFontSize.Value = 13;
+
+        WindowHeightValue.Value = 42;
+        ItemHeightValue.Value = 58;
+    }


Initially, we worked by changing the settings value, but there was an issue with the control not reflecting the change. After a few tries, we settled on just changing the value of the control.

+) This initial value has been matched to the initial value in settings.cs and should be matched in the future. No problem if it's different. Should we replace it with a contant value and align them both to constant?

onesounds · 2024-05-26T21:51:18Z

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

+    public int SearchFontIndex(string str, ComboBox combo)
+    {
+        int index = -1;
+        string targetFont = str;
+
+        for (int i = 0; i < combo.Items.Count; i++)
+        {
+            if (combo.Items[i].ToString() == targetFont)
+            {
+                index = i;
+                break;
+            }
+        }
+
+        if (index != -1)
+        {
+            return index;
+        }
+        else
+        {
+            // If there no Default Value.
+            return 0;
+        }
+    }
+    public int SearchFontStyleIndex(FamilyTypeface targetTypeface, ComboBox combo)
+    {
+        int index = -1;
+
+        for (int i = 0; i < combo.Items.Count; i++)
+        {
+            if (combo.Items[i] is FamilyTypeface)
+            {
+                FamilyTypeface typefaceItem = (FamilyTypeface)combo.Items[i];
+                if (typefaceItem.Stretch == targetTypeface.Stretch &&
+                    typefaceItem.Weight == targetTypeface.Weight &&
+                    typefaceItem.Style == targetTypeface.Style)
+                {
+                    index = i;
+                    break;
+                }
+            }
+        }
+
+        if (index != -1)
+        {
+            return index;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 }


Function to find a specific value when initializing a combobox to its default value.

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

onesounds · 2024-05-26T22:07:14Z

Flow.Launcher/Languages/en.xaml

+    <system:String x:Key="KeepMaxResults">Keeping Window Max Height</system:String>
+    <system:String x:Key="KeepMaxResultsToolTip">Window height will keep to fit the maximum number of results</system:String>


Check expression

The phrasing is not very clear, but I can't think of anything better. My version doesn't look much better:

Suggested change

<system:String x:Key="KeepMaxResults">Keeping Window Max Height</system:String>

<system:String x:Key="KeepMaxResultsToolTip">Window height will keep to fit the maximum number of results</system:String>

<system:String x:Key="KeepMaxResults">Fixed Window Height</system:String>

<system:String x:Key="KeepMaxResultsToolTip">The window height will be fixed to show up to the maximum number of results</system:String>

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

Yusyuriv · 2024-05-27T02:59:44Z

Flow.Launcher/Languages/en.xaml

+    <system:String x:Key="KeepMaxResults">Keeping Window Max Height</system:String>
+    <system:String x:Key="KeepMaxResultsToolTip">Window height will keep to fit the maximum number of results</system:String>


The phrasing is not very clear, but I can't think of anything better. My version doesn't look much better:

Suggested change

<system:String x:Key="KeepMaxResults">Keeping Window Max Height</system:String>

<system:String x:Key="KeepMaxResultsToolTip">Window height will keep to fit the maximum number of results</system:String>

<system:String x:Key="KeepMaxResults">Fixed Window Height</system:String>

<system:String x:Key="KeepMaxResultsToolTip">The window height will be fixed to show up to the maximum number of results</system:String>

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

Flow.Launcher/ViewModel/MainViewModel.cs

Flow.Launcher/MainWindow.xaml.cs

Flow.Launcher/MainWindow.xaml

Flow.Launcher/MainWindow.xaml.cs

…working

VictoriousRaptor · 2024-05-27T15:57:05Z

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

+        ResultSubItemFontStyleComboBox.SelectedIndex = SearchFontStyleIndex(targetTypeface, ResultSubItemFontStyleComboBox);
+        ResultSubItemFontSize.Value = 13;
+
+        WindowHeightValue.Value = 42;


why there's a .Value ? shouldn't it be an int? just took a quick glance and don't have time to further review it.

This item changes the value of a specific control (slider) rather than a setting.
This was implemented because there was an issue with changing the value of a set value not being reflected in the control.

VictoriousRaptor · 2024-05-27T15:58:46Z

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

+                                Maximum="60"
+                                Minimum="20"
+                                TickFrequency="2"
+                                Value="{Binding WindowHeightSize, Mode=TwoWay}" />


Looks like it's here. but why not just set WindowHeightSize and separate the UI

I don't get what are you mean. pardon~?

onesounds added 3 commits May 14, 2024 16:54

Change Window to Resizable

2e3b61c

- Add Theme Editor

a628bc5

- Add Subtitle font style combobox

Remove Hand Cursor Style

3659399

jjw24 marked this pull request as draft May 17, 2024 05:56

onesounds self-assigned this May 22, 2024

onesounds added the enhancement New feature or request label May 22, 2024

onesounds added 11 commits May 25, 2024 09:54

Merge Dev

68f34fa

Merge Dev

8d566d0

Adjust Toggle Style

d31c9a0

Change Edit Button to Icon

37ab4aa

Fix Scroll for bottom margin in theme

d7272d9

Add Strings

5e5c9ae

Removed MaxResult/Width item in settings

4acbb7a

Adjust Quick Resize Logic

a88f165

Fix Sidebar Color

7b106c5

Merge branch 'dev' into 240514ResizableWindow

acde180

- Add Reset Button Function

cedf0c6

- Fix Conflict

onesounds commented May 25, 2024

View reviewed changes

onesounds and others added 9 commits May 25, 2024 22:22

Adjust Default Value

5a0f4ac

Fix window height reset issue

de94f39

Fix binding problem

0a52d71

- RollBack reset logic and Adjust naming

4fd05f5

Adjust Reset Logic

188c409

Add Keep Height (old behaiver) function

ea4578f

Adjust Layout for Long Label (language)

3f710f2

Adjust Item Position

MaxResult Item to Theme from General

ba3d262

Adjust Width Logic

a6de6c7

onesounds commented May 26, 2024

View reviewed changes

Merge branch 'dev' into 240514ResizableWindow

94df8d9

onesounds marked this pull request as ready for review May 26, 2024 21:52

onesounds requested review from VictoriousRaptor, taooceros, Yusyuriv and jjw24 and removed request for VictoriousRaptor and taooceros May 26, 2024 21:52

onesounds commented May 26, 2024

View reviewed changes

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml Outdated Show resolved Hide resolved

onesounds commented May 26, 2024

View reviewed changes

Yusyuriv requested changes May 27, 2024

View reviewed changes

Yusyuriv added 5 commits May 27, 2024 12:26

Fix memory leak in ResultViewModel

83bc664

Appearance pane in settings: fix custom animation length TextBox not …

2893487

…working

Resizeable window: fixes after review

8c3ef71

Resizeable window PR: remove GridSplitter

990f932

Resizeable window PR: en.xaml correction

218685d

VictoriousRaptor reviewed May 27, 2024

View reviewed changes

Merge branch 'dev' into 240514ResizableWindow

e39a7ed

Yusyuriv approved these changes May 28, 2024

View reviewed changes

onesounds merged commit c9061a4 into Flow-Launcher:dev May 28, 2024
3 checks passed

onesounds mentioned this pull request May 31, 2024

WPFUI / Fluent Window / Theme system / Resizable Window #2635

Closed

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resizable Window + Customize #2699

Resizable Window + Customize #2699

onesounds commented May 17, 2024 •

edited

onesounds May 25, 2024

onesounds May 25, 2024

onesounds May 25, 2024

onesounds May 25, 2024

onesounds May 26, 2024

onesounds May 26, 2024

onesounds May 26, 2024

Yusyuriv May 27, 2024 •

edited

Yusyuriv May 27, 2024 •

edited

VictoriousRaptor May 27, 2024

onesounds May 27, 2024

VictoriousRaptor May 27, 2024

onesounds May 27, 2024

		<system:String x:Key="KeepMaxResults">Keeping Window Max Height</system:String>
		<system:String x:Key="KeepMaxResultsToolTip">Window height will keep to fit the maximum number of results</system:String>

Resizable Window + Customize #2699

Resizable Window + Customize #2699

Conversation

onesounds commented May 17, 2024 • edited

What's the PR