Merge branch 'master' into pr/83
This commit is contained in:
commit
4960cdfd94
2 files changed
+8
-1
No files matched your search
@@ -161,7 +161,7 @@
|
|||||||
<Image Source="../../Resources/Img/LeftMainContent/ToolBar_16x.png"/>
|
<Image Source="../../Resources/Img/LeftMainContent/ToolBar_16x.png"/>
|
||||||
</controls:EdgeElement.LeftContent>
|
</controls:EdgeElement.LeftContent>
|
||||||
</ListBoxItem>
|
</ListBoxItem>
|
||||||
<ListBoxItem Tag="{x:Static data:MessageToken.BorderDemoCtl}" Content="{x:Static langs:Lang.Border}">
|
<ListBoxItem Tag="{x:Static data:MessageToken.BorderDemoCtl}" Name="ListBoxItemBorder">
|
||||||
<controls:EdgeElement.LeftContent>
|
<controls:EdgeElement.LeftContent>
|
||||||
<Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
|
<Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
|
||||||
</controls:EdgeElement.LeftContent>
|
</controls:EdgeElement.LeftContent>
|
||||||
|
|||||||
@@ -16,6 +16,13 @@ namespace HandyControlDemo.UserControl
|
|||||||
public LeftMainContent()
|
public LeftMainContent()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
|
/*You have to ask me why I made Border special.
|
||||||
|
What drives me crazy is that if you don't do this,
|
||||||
|
the content of ListBoxItemBorder will always be 1 !
|
||||||
|
How amazing!
|
||||||
|
I wish someone could tell me why. */
|
||||||
|
ListBoxItemBorder.Content = Properties.Langs.Lang.Border;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
|
private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
|
|||||||
Reference in new issue
Block a user