admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✅ 调整合适宽度

Browse Source
This commit is contained in:
BookerLiu
2023-04-04 13:47:08 +08:00
parent b12bbe9183
commit 3654ec393a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Control/UserControls/PannelCard/RightCardControl.xaml
View File

@@ -182,9 +182,13 @@
CanContentScroll="True" CanContentScroll="True"
PreviewMouseWheel="IconListBox_MouseWheel" PreviewMouseWheel="IconListBox_MouseWheel"
> >
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderBrush}"> <Border BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderBrush}"
Width="{Binding AppConfig.WindowWidth, Mode=OneWay,
Converter={StaticResource GetWidthByWWConvert},
ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD}}"
>
<ItemsPresenter/> <ItemsPresenter/>
</Border> </Border>
</hc:ScrollViewer> </hc:ScrollViewer>
</ControlTemplate> </ControlTemplate>

4
Converts/GetWidthByWWConvert.cs
View File

@@ -26,10 +26,10 @@ namespace GeekDesk.Converts
return config.WindowWidth - config.MenuCardWidth; return config.WindowWidth - config.MenuCardWidth;
} else if (WidthTypeEnum.RIGHT_CARD_HALF == type) } else if (WidthTypeEnum.RIGHT_CARD_HALF == type)
{ {
return (config.WindowWidth - config.MenuCardWidth) * 0.8; return (config.WindowWidth - config.MenuCardWidth) * 0.618;
} else if (WidthTypeEnum.RIGHT_CARD_HALF_TEXT == type) } else if (WidthTypeEnum.RIGHT_CARD_HALF_TEXT == type)
{ {
return (config.WindowWidth - config.MenuCardWidth) * 0.8 - config.ImageWidth - 20; return (config.WindowWidth - config.MenuCardWidth) * 0.618 - config.ImageWidth - 20;
} }
return config.WindowWidth; return config.WindowWidth;