🐛 修复列表显示不全的bug

This commit is contained in:
BookerLiu
2023-04-17 13:26:58 +08:00
parent dd41635199
commit 6072832654
3 changed files with 11 additions and 4 deletions

View File

@@ -14,5 +14,6 @@ namespace GeekDesk.Constant
RIGHT_CARD_HALF_TEXT = 3, //右侧托盘宽度的一半 再减去左侧图像宽度 RIGHT_CARD_HALF_TEXT = 3, //右侧托盘宽度的一半 再减去左侧图像宽度
RIGHT_CARD_20 = 4, //右侧托盘宽度 - 20 RIGHT_CARD_20 = 4, //右侧托盘宽度 - 20
RIGHT_CARD_40 = 5, //右侧托盘宽度 - 40 RIGHT_CARD_40 = 5, //右侧托盘宽度 - 40
RIGHT_CARD_70 = 6, //右侧托盘宽度 - 70
} }
} }

View File

@@ -186,9 +186,7 @@
> >
<Border BorderBrush="{TemplateBinding BorderBrush}" <Border BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderBrush}"
Width="{Binding AppConfig.WindowWidth, Mode=OneWay,
Converter={StaticResource GetWidthByWWConvert},
ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_40}}"
> >
<ItemsPresenter/> <ItemsPresenter/>
</Border> </Border>
@@ -212,7 +210,7 @@
VirtualizingPanel.ScrollUnit="Pixel" VirtualizingPanel.ScrollUnit="Pixel"
Width="{Binding AppConfig.WindowWidth, Mode=OneWay, Width="{Binding AppConfig.WindowWidth, Mode=OneWay,
Converter={StaticResource GetWidthByWWConvert}, Converter={StaticResource GetWidthByWWConvert},
ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_40}}" ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_70}}"
/> />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListBox.ItemsPanel> </ListBox.ItemsPanel>

View File

@@ -34,6 +34,14 @@ namespace GeekDesk.Converts
{ {
return (config.WindowWidth - config.MenuCardWidth) - 20; return (config.WindowWidth - config.MenuCardWidth) - 20;
} }
else if (WidthTypeEnum.RIGHT_CARD_40 == type)
{
return (config.WindowWidth - config.MenuCardWidth) - 40;
}
else if (WidthTypeEnum.RIGHT_CARD_70 == type)
{
return (config.WindowWidth - config.MenuCardWidth) - 70;
}
return config.WindowWidth; return config.WindowWidth;
} }