Skip to content

Commit 95b7355

Browse files
qian-oqian-o
authored
Merge pull request #21 from qian-o/refactor/event-names
Refactor event names
2 parents 3539612 + 5ca4d9c commit 95b7355

14 files changed

+93
-100
lines changed

‎src/Examples/UnoApp/MainWindow.xaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<dock:DockManager x:Name="dockManager"
2424
Grid.Row="1"
25-
CreateNewDocument="DockManager_CreateNewDocument"
26-
CreateNewGroup="DockManager_CreateNewGroup"
27-
CreateNewWindow="DockManager_CreateNewWindow"
25+
FillDocument="DockManager_FillDocument"
26+
NewGroup="DockManager_NewGroup"
27+
NewWindow="DockManager_NewWindow"
2828
ParentWindow="{Binding ElementName=Main}">
2929
<dock:DockManager.LeftSide>
3030
<dock:Document Title="Side##Left 1">
@@ -96,14 +96,14 @@
9696

9797
<dock:LayoutPanel DockHeight="1"
9898
Orientation="Horizontal">
99-
<dock:DocumentGroup IsTabWidthBasedOnContent="True"
100-
TabPosition="Bottom">
99+
<dock:DocumentGroup TabPosition="Bottom"
100+
UseCompactTabs="True">
101101
<dock:Document Title="Side##Error List">
102102
Error List
103103
</dock:Document>
104104
</dock:DocumentGroup>
105-
<dock:DocumentGroup IsTabWidthBasedOnContent="True"
106-
TabPosition="Bottom">
105+
<dock:DocumentGroup TabPosition="Bottom"
106+
UseCompactTabs="True">
107107
<dock:Document Title="Side##Output">
108108
Output
109109
</dock:Document>

‎src/Examples/UnoApp/MainWindow.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private void Open_Click(object _, RoutedEventArgs __)
3030
}
3131
}
3232

33-
private void DockManager_CreateNewDocument(object _, CreateNewDocumentEventArgs e)
33+
private void DockManager_FillDocument(object _, FillDocumentEventArgs e)
3434
{
3535
e.Document.Content = new TextBlock()
3636
{
@@ -40,16 +40,16 @@ private void DockManager_CreateNewDocument(object _, CreateNewDocumentEventArgs
4040
};
4141
}
4242

43-
private void DockManager_CreateNewGroup(object _, CreateNewGroupEventArgs e)
43+
private void DockManager_NewGroup(object _, NewGroupEventArgs e)
4444
{
4545
if (e.Title.Contains("Side"))
4646
{
4747
e.Group.TabPosition = TabPosition.Bottom;
48-
e.Group.IsTabWidthBasedOnContent = true;
48+
e.Group.UseCompactTabs = true;
4949
}
5050
}
5151

52-
private void DockManager_CreateNewWindow(object _, CreateNewWindowEventArgs e)
52+
private void DockManager_NewWindow(object _, NewWindowEventArgs e)
5353
{
5454
e.Window.Title = "Custom Window Title";
5555

‎src/Examples/WinUIApp/MainWindow.xaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<dock:DockManager x:Name="dockManager"
2424
Grid.Row="1"
25-
CreateNewDocument="DockManager_CreateNewDocument"
26-
CreateNewGroup="DockManager_CreateNewGroup"
27-
CreateNewWindow="DockManager_CreateNewWindow"
25+
FillDocument="DockManager_FillDocument"
26+
NewGroup="DockManager_NewGroup"
27+
NewWindow="DockManager_NewWindow"
2828
ParentWindow="{Binding ElementName=Main}">
2929
<dock:DockManager.LeftSide>
3030
<dock:Document Title="Side##Left 1">
@@ -96,14 +96,14 @@
9696

9797
<dock:LayoutPanel DockHeight="1"
9898
Orientation="Horizontal">
99-
<dock:DocumentGroup IsTabWidthBasedOnContent="True"
100-
TabPosition="Bottom">
99+
<dock:DocumentGroup TabPosition="Bottom"
100+
UseCompactTabs="True">
101101
<dock:Document Title="Side##Error List">
102102
Error List
103103
</dock:Document>
104104
</dock:DocumentGroup>
105-
<dock:DocumentGroup IsTabWidthBasedOnContent="True"
106-
TabPosition="Bottom">
105+
<dock:DocumentGroup TabPosition="Bottom"
106+
UseCompactTabs="True">
107107
<dock:Document Title="Side##Output">
108108
Output
109109
</dock:Document>

‎src/Examples/WinUIApp/MainWindow.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private void Open_Click(object _, RoutedEventArgs __)
3232
}
3333
}
3434

35-
private void DockManager_CreateNewDocument(object _, CreateNewDocumentEventArgs e)
35+
private void DockManager_FillDocument(object _, FillDocumentEventArgs e)
3636
{
3737
e.Document.Content = new TextBlock()
3838
{
@@ -42,16 +42,16 @@ private void DockManager_CreateNewDocument(object _, CreateNewDocumentEventArgs
4242
};
4343
}
4444

45-
private void DockManager_CreateNewGroup(object _, CreateNewGroupEventArgs e)
45+
private void DockManager_NewGroup(object _, NewGroupEventArgs e)
4646
{
4747
if (e.Title.Contains("Side"))
4848
{
4949
e.Group.TabPosition = TabPosition.Bottom;
50-
e.Group.IsTabWidthBasedOnContent = true;
50+
e.Group.UseCompactTabs = true;
5151
}
5252
}
5353

54-
private void DockManager_CreateNewWindow(object _, CreateNewWindowEventArgs e)
54+
private void DockManager_NewWindow(object _, NewWindowEventArgs e)
5555
{
5656
e.Window.Title = "Custom Window Title";
5757

‎src/WinUI.Dock/Controls/DockWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private void InitializeWindow(DockManager manager, Document? document)
9393
});
9494
}
9595

96-
manager.InvokeCreateNewWindow(AppWindow, TitleBar);
96+
manager.InvokeNewWindow(AppWindow, TitleBar);
9797

9898
DockWindowHelpers.AddWindow(manager, this);
9999
}

‎src/WinUI.Dock/Controls/DocumentTabItem.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
IsClosable="False"
1010
Style="{StaticResource TabViewItemStyle}">
1111
<TabViewItem.Header>
12-
<Grid RenderTransformOrigin="0.5,0.5">
12+
<Grid x:Name="Tab"
13+
Padding="12,2,8,2"
14+
RenderTransformOrigin="0.5,0.5">
1315
<Grid.RenderTransform>
1416
<ScaleTransform x:Name="HeaderScale" />
1517
</Grid.RenderTransform>

‎src/WinUI.Dock/Controls/DocumentTabItem.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public DocumentTabItem(Document document)
3030

3131
public Document? Document { get; private set; }
3232

33+
public double TabWidth { get => Tab.Width; set => Tab.Width = value; }
34+
3335
public void UpdateVisualState(TabPosition tabPosition)
3436
{
3537
bool isBottom = tabPosition is TabPosition.Bottom;
@@ -92,9 +94,7 @@ private void OnDropCompleted(UIElement _, DropCompletedEventArgs args)
9294

9395
if (args.DropResult is not DataPackageOperation.Move)
9496
{
95-
DockWindow dockWindow = new(dockManager, document);
96-
97-
dockWindow.Activate();
97+
new DockWindow(dockManager, document).Activate();
9898
}
9999

100100
DragDropHelpers.RemoveDockManagerKey(dockManagerKey);

‎src/WinUI.Dock/Controls/PopupDocument.xaml.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ private void Header_DropCompleted(UIElement _, DropCompletedEventArgs args)
132132
{
133133
if (args.DropResult is not DataPackageOperation.Move)
134134
{
135-
DockWindow dockWindow = new(Manager, document);
136-
137-
dockWindow.Activate();
135+
new DockWindow(Manager, document).Activate();
138136
}
139137

140138
DragDropHelpers.RemoveDocumentKey(documentKey);

‎src/WinUI.Dock/DockManager.xaml.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
namespace WinUI.Dock;
1212

13-
public record CreateNewDocumentEventArgs(string Title, Document Document);
13+
public record ActiveDocumentChangedEventArgs(Document? OldDocument, Document? NewDocument);
1414

15-
public record CreateNewGroupEventArgs(string Title, DocumentGroup Group);
15+
public record FillDocumentEventArgs(string Title, Document Document);
1616

17-
public record CreateNewWindowEventArgs(AppWindow Window, Border TitleBar);
17+
public record NewGroupEventArgs(string Title, DocumentGroup Group);
1818

19-
public record ActiveDocumentChangedEventArgs(Document? OldDocument, Document? NewDocument);
19+
public record NewWindowEventArgs(AppWindow Window, Border TitleBar);
2020

2121
[ContentProperty(Name = nameof(Panel))]
2222
[TemplatePart(Name = "PART_PopupContainer", Type = typeof(Border))]
@@ -80,13 +80,13 @@ public Window? ParentWindow
8080

8181
public Border? PopupContainer { get; private set; }
8282

83-
public event EventHandler<CreateNewDocumentEventArgs>? CreateNewDocument;
83+
public event EventHandler<ActiveDocumentChangedEventArgs>? ActiveDocumentChanged;
8484

85-
public event EventHandler<CreateNewGroupEventArgs>? CreateNewGroup;
85+
public event EventHandler<FillDocumentEventArgs>? FillDocument;
8686

87-
public event EventHandler<CreateNewWindowEventArgs>? CreateNewWindow;
87+
public event EventHandler<NewGroupEventArgs>? NewGroup;
8888

89-
public event EventHandler<ActiveDocumentChangedEventArgs>? ActiveDocumentChanged;
89+
public event EventHandler<NewWindowEventArgs>? NewWindow;
9090

9191
public void ClearLayout()
9292
{
@@ -182,7 +182,7 @@ void InvokeCreateNewDocument(IEnumerable<DockModule> modules)
182182
{
183183
if (module is Document document)
184184
{
185-
CreateNewDocument?.Invoke(this, new CreateNewDocumentEventArgs(document.Title, document));
185+
FillDocument?.Invoke(this, new FillDocumentEventArgs(document.Title, document));
186186

187187
if (document.Path() == activeDocumentPath)
188188
{
@@ -277,7 +277,7 @@ internal void Dock(Document document, DockTarget target)
277277
group.CopySizeFrom(document);
278278
group.Children.Add(document);
279279

280-
CreateNewGroup?.Invoke(this, new CreateNewGroupEventArgs(document.Title, group));
280+
NewGroup?.Invoke(this, new NewGroupEventArgs(document.Title, group));
281281

282282
LayoutPanel panel = new();
283283
panel.Children.Add(group);
@@ -334,14 +334,14 @@ internal void HideDockTargets()
334334
VisualStateManager.GoToState(this, "HideDockTargets", false);
335335
}
336336

337-
internal void InvokeCreateNewGroup(string title, DocumentGroup group)
337+
internal void InvokeNewGroup(string title, DocumentGroup group)
338338
{
339-
CreateNewGroup?.Invoke(this, new CreateNewGroupEventArgs(title, group));
339+
NewGroup?.Invoke(this, new NewGroupEventArgs(title, group));
340340
}
341341

342-
internal void InvokeCreateNewWindow(AppWindow window, Border titleBar)
342+
internal void InvokeNewWindow(AppWindow window, Border titleBar)
343343
{
344-
CreateNewWindow?.Invoke(this, new CreateNewWindowEventArgs(window, titleBar));
344+
NewWindow?.Invoke(this, new NewWindowEventArgs(window, titleBar));
345345
}
346346

347347
private void OnSideCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)

‎src/WinUI.Dock/DocumentGroup.xaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,6 @@
3333
</VisualState>
3434
</VisualStateGroup>
3535

36-
<VisualStateGroup x:Name="IsTabWidthBasedOnContent">
37-
<VisualState x:Name="TabWidthEqual">
38-
<VisualState.Setters>
39-
<Setter Target="PART_Root.TabWidthMode" Value="Equal" />
40-
</VisualState.Setters>
41-
</VisualState>
42-
<VisualState x:Name="TabWidthSizeToContent">
43-
<VisualState.Setters>
44-
<Setter Target="PART_Root.TabWidthMode" Value="SizeToContent" />
45-
</VisualState.Setters>
46-
</VisualState>
47-
</VisualStateGroup>
48-
4936
<VisualStateGroup x:Name="OperationDockTargets">
5037
<VisualState x:Name="ShowDockTargets">
5138
<VisualState.Setters>

0 commit comments

Comments
 (0)