nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5307 from fortsnek9348/stuff

Browse source 
Fix the position of the blue dot on the upgrade tab.
This commit is contained in:
Lars Brubaker 2022-04-26 17:57:14 -07:00 • committed by GitHub
commit 85754f8ea3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -261,20 +261,26 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Upgrade tab
if (!ApplicationController.Instance.IsMatterControlPro())
{
tabControl.AddTab(
tab = new ChromeTab("Upgrade", "Upgrade".Localize(), tabControl, new UpgradeToProTabPage(theme), theme, hasClose: false)
{
MinimumSize = new Vector2(0, theme.TabButtonHeight),
Name = "Upgrade",
Padding = new BorderDouble(15, 0),
});
tab = new ChromeTab("Upgrade", "Upgrade".Localize(), tabControl, new UpgradeToProTabPage(theme), theme, hasClose: false)
{
MinimumSize = new Vector2(0, theme.TabButtonHeight),
Name = "Upgrade",
Padding = new BorderDouble(15, 0),
};
tabControl.AddTab(tab);
ChromeTab upgradeTab = tab;
tab.AfterDraw += (s, e) =>
{
var textWidget = tab.Descendants<TextWidget>().FirstOrDefault();
e.Graphics2D.Circle(Math.Max(textWidget.Width, tab.LocalBounds.Right - 25 * DeviceScale),
tab.LocalBounds.Bottom + tab.Height / 2 - 1 * DeviceScale,
5 * DeviceScale,
var textWidget = upgradeTab.Descendants<TextWidget>().FirstOrDefault();
var localLabelEndPosition = textWidget.TransformToScreenSpace(textWidget.Printer.GetSize()) - upgradeTab.TransformToScreenSpace(Vector2.Zero);
double radius = 5 * DeviceScale;
e.Graphics2D.Circle(localLabelEndPosition.X + radius + 3 * DeviceScale,
upgradeTab.LocalBounds.Bottom + upgradeTab.Height / 2 - 1 * DeviceScale,
radius,
theme.PrimaryAccentColor);
};
}

2
MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -335,7 +335,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
hasClose: false,
pointSize: theme.DefaultFontSize)
{
Name = category.Name + " Tab",
Name = category.Name + " SliceSettingsTab",
InactiveTabColor = Color.Transparent,
ActiveTabColor = theme.BackgroundColor
});

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit ba51c5c12e8efa9adac7ab8e511bb2880041b198
Subproject commit 1fca5e0a2e913392761a3cb5fc6ab9f8abbc1c52

4
Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
View file

@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.AddAndSelectPrinter("Airwolf 3D", "HD");
testRunner.SwitchToPrinterSettings();
testRunner.ClickByName("Features Tab");
testRunner.ClickByName("Features SliceSettingsTab");
testRunner.ClickByName("Slice Settings Overflow Menu");
testRunner.ClickByName("Advanced Menu Item");
Assert.IsFalse(testRunner.WaitForName("print_leveling_solution Row", .5), "Print leveling should not exist for an Airwolf HD");
@ -27,7 +27,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.AddAndSelectPrinter("3D Factory", "MendelMax 1.5");
testRunner.SwitchToPrinterSettings();
testRunner.ClickByName("Features Tab");
testRunner.ClickByName("Features SliceSettingsTab");
testRunner.ClickByName("Slice Settings Overflow Menu");
testRunner.ClickByName("Advanced Menu Item");
Assert.IsTrue(testRunner.WaitForName("print_leveling_solution Row"), "Print leveling should exist for a 3D Factory MendelMax");

6
Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
View file

@ -243,7 +243,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
.AddAndSelectPrinter("Airwolf 3D", "HD")
// Navigate to Local Library
.SwitchToPrinterSettings()
.ClickByName("Features Tab");
.ClickByName("Features SliceSettingsTab");
var printer = testRunner.FirstPrinter();
@ -262,7 +262,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
using (var emulator = testRunner.LaunchAndConnectToPrinterEmulator())
{
testRunner.ClickByName("Features Tab");
testRunner.ClickByName("Features SliceSettingsTab");
// only 1 hotend and 1 extruder
Assert.IsTrue(testRunner.NameExists("Hotend 0"));
@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.AreEqual(0, (int)emulator.CurrentExtruder.TargetTemperature);
// Switch back to the general tab
testRunner.ClickByName("General Tab")
testRunner.ClickByName("General SliceSettingsTab")
.SelectSliceSettingsField(SettingsKey.extruder_count)
.Type("2")
.Type("{Enter}");

2
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -1326,7 +1326,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
var category = group.Category;
// Click tab
testRunner.ClickByName(category.Name + " Tab");
testRunner.ClickByName(category.Name + " SliceSettingsTab");
// Open the subGroup if required
var foundWidget = testRunner.GetWidgetByName(group.Name + " Panel", out _, .1);