From cc3c3c036777718922bc22860ff730cc35d00d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?= <me@jiripolasek.com>
Date: Sun, 1 Mar 2026 20:06:42 +0100
Subject: [PATCH] Dock: dock visual nits and bits (#45873)

## Summary of the Pull Request

- Improves vertical (left/right) dock layout:
  - Dock items are not clipped;
  - Items with label(s) are stretched to full width;
  - Items without label(s) are centered.
- Top button is in the absolute corner to make clicking to it easier.
- Dock items now have a min width and height 32px.
- Removes a duplicate "No background" label in the expander body on the
Dock settings page.

## Pictures? Pictures!
Vertical layout:
<img width="175" height="1439" alt="image"
src="https://github.com/user-attachments/assets/4f11d9e9-405f-4d9a-8dee-4c8912b88c7c"
/>

Horizontal layout:
<img width="5119" height="49" alt="image"
src="https://github.com/user-attachments/assets/8420ef26-575e-4427-8db8-f9793e3b3572"
/>



<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] Closes: #xxx
<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
---
 .../Controls/ScrollContainer.xaml                    | 12 ++++++------
 .../cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml |  8 ++++----
 .../Microsoft.CmdPal.UI/Dock/DockItemControl.xaml    |  5 ++++-
 .../Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs |  2 +-
 .../Microsoft.CmdPal.UI/Strings/en-us/Resources.resw |  3 ---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml
index c649c677ea..ef1e65a01f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ScrollContainer.xaml
@@ -141,10 +141,10 @@
             Grid.Column="1">
             <ScrollViewer
                 x:Name="scroller"
-                HorizontalScrollBarVisibility="Hidden"
+                HorizontalScrollBarVisibility="Disabled"
                 HorizontalScrollMode="Enabled"
                 SizeChanged="Scroller_SizeChanged"
-                VerticalScrollBarVisibility="Hidden"
+                VerticalScrollBarVisibility="Disabled"
                 VerticalScrollMode="Disabled"
                 ViewChanging="Scroller_ViewChanging">
                 <Grid x:Name="ContentGrid">
@@ -188,9 +188,9 @@
             <VisualStateGroup x:Name="OrientationStates">
                 <VisualState x:Name="HorizontalState">
                     <VisualState.Setters>
-                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.HorizontalScrollMode" Value="Enabled" />
-                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.VerticalScrollMode" Value="Disabled" />
                         <Setter Target="ScrollBackBtn.Padding" Value="4,12,4,12" />
                         <Setter Target="ScrollBackBtn.Margin" Value="8,0,0,0" />
@@ -210,9 +210,9 @@
                 </VisualState>
                 <VisualState x:Name="VerticalState">
                     <VisualState.Setters>
-                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.HorizontalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.HorizontalScrollMode" Value="Disabled" />
-                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Hidden" />
+                        <Setter Target="scroller.VerticalScrollBarVisibility" Value="Disabled" />
                         <Setter Target="scroller.VerticalScrollMode" Value="Enabled" />
                         <Setter Target="ScrollBackBtn.Padding" Value="12,4,12,4" />
                         <Setter Target="ScrollBackBtn.Margin" Value="0,8,0,0" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
index 48d29a2df2..738ee5f05f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
@@ -386,8 +386,8 @@
                         <Setter Target="EndScroller.(Grid.ColumnSpan)" Value="3" />
                         <Setter Target="EndScroller.HorizontalAlignment" Value="Stretch" />
                         <Setter Target="EndScroller.VerticalAlignment" Value="Bottom" />
-                        <Setter Target="ContentGrid.Margin" Value="0,4,4,4" />
-                        <Setter Target="ContentGrid.Padding" Value="0,8,4,8" />
+                        <Setter Target="ContentGrid.Margin" Value="0,0,4,4" />
+                        <Setter Target="ContentGrid.Padding" Value="0,0,4,8" />
                         <Setter Target="RootGrid.BorderThickness" Value="0,0,1,0" />
 
                         <Setter Target="StartListView.ItemsPanel" Value="{StaticResource VerticalItemsPanel}" />
@@ -425,8 +425,8 @@
                         <Setter Target="EndScroller.(Grid.ColumnSpan)" Value="3" />
                         <Setter Target="EndScroller.HorizontalAlignment" Value="Stretch" />
                         <Setter Target="EndScroller.VerticalAlignment" Value="Bottom" />
-                        <Setter Target="ContentGrid.Margin" Value="4,4,0,4" />
-                        <Setter Target="ContentGrid.Padding" Value="4,8,0,8" />
+                        <Setter Target="ContentGrid.Margin" Value="4,0,0,4" />
+                        <Setter Target="ContentGrid.Padding" Value="4,0,0,8" />
                         <Setter Target="RootGrid.BorderThickness" Value="1,0,0,0" />
 
                         <Setter Target="StartListView.ItemsPanel" Value="{StaticResource VerticalItemsPanel}" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
index 18957f82ab..9c595762d9 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
@@ -66,6 +66,8 @@
                             ToolTipService.ToolTip="{TemplateBinding ToolTip}">
                             <Grid
                                 x:Name="PART_RootGrid"
+                                MinWidth="32"
+                                MinHeight="30"
                                 Margin="{TemplateBinding InnerMargin}"
                                 Padding="{TemplateBinding Padding}"
                                 VerticalAlignment="Stretch"
@@ -80,7 +82,7 @@
                                     ColumnSpacing="8">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
 
                                     <!--  Icon  -->
@@ -164,6 +166,7 @@
                                     <VisualState x:Name="TextHidden">
                                         <VisualState.Setters>
                                             <Setter Target="ContentGrid.ColumnSpacing" Value="0" />
+                                            <Setter Target="ContentGrid.HorizontalAlignment" Value="Center" />
                                             <Setter Target="TextPanel.Visibility" Value="Collapsed" />
                                         </VisualState.Setters>
                                     </VisualState>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
index 527b2bd834..aa61325603 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml.cs
@@ -170,7 +170,7 @@ public sealed partial class DockItemControl : Control
             }
         }
 
-        HorizontalAlignment = HorizontalAlignment.Center;
+        HorizontalAlignment = HorizontalAlignment.Stretch;
     }
 
     private void UpdateAllVisibility()
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
index e40c0b05b0..24c415c470 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -796,9 +796,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="DockAppearance_ColorizationMode.Header" xml:space="preserve">
     <value>Colorization mode</value>
   </data>
-  <data name="DockAppearance_NoBackground_SettingsCard.Header" xml:space="preserve">
-    <value>No background</value>
-  </data>
   <data name="DockAppearance_NoBackground_DescriptionTextBlock.Text" xml:space="preserve">
     <value>No settings</value>
   </data>