Add close x to Configure -> Printer
- Issue MatterHackers/MCCentral#2572
This commit is contained in:
parent
dea37667ad
commit
01221d9d95
3 changed files with 22 additions and 9 deletions
|
|
@ -186,27 +186,36 @@ namespace MatterHackers.MatterControl.CustomWidgets
|
|||
}
|
||||
|
||||
int tabIndex = 0;
|
||||
foreach (var nameWidget in allTabs)
|
||||
foreach (var kvp in allTabs)
|
||||
{
|
||||
string tabTitle = nameWidget.Key;
|
||||
string tabTitle = kvp.Key;
|
||||
|
||||
if (this.ControlIsPinned)
|
||||
{
|
||||
var content = new DockingWindowContent(this, nameWidget.Value, tabTitle);
|
||||
var content = new DockingWindowContent(this, kvp.Value, tabTitle);
|
||||
|
||||
tabControl.AddTab(
|
||||
new ToolTab(
|
||||
var tab = new ToolTab(
|
||||
tabTitle,
|
||||
tabControl,
|
||||
content,
|
||||
theme,
|
||||
hasClose: false,
|
||||
hasClose: kvp.Value is ConfigurePrinterWidget,
|
||||
pointSize: theme.FontSize11)
|
||||
{
|
||||
Name = tabTitle + " Tab",
|
||||
InactiveTabColor = Color.Transparent,
|
||||
ActiveTabColor = theme.TabBodyBackground
|
||||
});
|
||||
};
|
||||
|
||||
tab.CloseClicked += (s, e) =>
|
||||
{
|
||||
if (tab.Name == "Printer Tab")
|
||||
{
|
||||
printer.ViewState.ConfigurePrinterVisible = false;
|
||||
}
|
||||
};
|
||||
|
||||
tabControl.AddTab(tab);
|
||||
}
|
||||
else // control is floating
|
||||
{
|
||||
|
|
@ -247,7 +256,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
|
|||
SpliterBarColor = spliterColor,
|
||||
SplitterWidth = ApplicationController.Instance.Theme.SplitterWidth,
|
||||
};
|
||||
resizeContainer.AddChild(new DockingWindowContent(this, nameWidget.Value, tabTitle)
|
||||
resizeContainer.AddChild(new DockingWindowContent(this, kvp.Value, tabTitle)
|
||||
{
|
||||
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor,
|
||||
Width = PageWidth
|
||||
|
|
@ -303,6 +312,10 @@ namespace MatterHackers.MatterControl.CustomWidgets
|
|||
{
|
||||
tabControl.SelectedTabIndex = printer.ViewState.SliceSettingsTabIndex;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabControl.SelectedTabIndex = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue