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

Merge pull request #1552 from larsbrubaker/1.6.0

Browse source 
Fixed home icon being the wronge size on touch.
This commit is contained in:
Lars Brubaker 2016-10-28 14:27:07 -07:00 • committed by GitHub
commit c83eb4b2ea
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PartPreviewWindow/ViewControls2D.cs
View file

@ -79,8 +79,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
iconTextImageButtonFactory.checkedBorderColor = RGBA_Bytes.White;
BackgroundColor = new RGBA_Bytes(0, 0, 0, 120);
iconTextImageButtonFactory.FixedHeight = buttonHeight;
iconTextImageButtonFactory.FixedWidth = buttonHeight;
iconTextImageButtonFactory.FixedHeight = buttonHeight * GuiWidget.DeviceScale;
iconTextImageButtonFactory.FixedWidth = buttonHeight * GuiWidget.DeviceScale;
string resetViewIconPath = Path.Combine("ViewTransformControls", "reset.png");
resetViewButton = iconTextImageButtonFactory.Generate("", StaticData.Instance.LoadIcon(resetViewIconPath,32,32).InvertLightness());
@ -125,8 +125,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
BackgroundColor = new RGBA_Bytes(0, 0, 0, 120);
iconTextImageButtonFactory.FixedHeight = buttonHeight;
iconTextImageButtonFactory.FixedWidth = buttonHeight;
iconTextImageButtonFactory.FixedHeight = buttonHeight * GuiWidget.DeviceScale;
iconTextImageButtonFactory.FixedWidth = buttonHeight * GuiWidget.DeviceScale;
string select2dIconPath = Path.Combine("ViewTransformControls", "2d.png");
twoDimensionButton = iconTextImageButtonFactory.GenerateRadioButton("", select2dIconPath);

4
PartPreviewWindow/ViewControls3D.cs
View file

@ -131,8 +131,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
textImageButtonFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor;
BackgroundColor = new RGBA_Bytes(0, 0, 0, 120);
textImageButtonFactory.FixedHeight = buttonHeight;
textImageButtonFactory.FixedWidth = buttonHeight;
textImageButtonFactory.FixedHeight = buttonHeight * GuiWidget.DeviceScale;
textImageButtonFactory.FixedWidth = buttonHeight * GuiWidget.DeviceScale;
textImageButtonFactory.AllowThemeToAdjustImage = false;
textImageButtonFactory.checkedBorderColor = RGBA_Bytes.White;