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

Make the minimum window height 480

Browse source 
Made more controls able to scale down
- color swatch
- tumble control
- default button height
This commit is contained in:
Lars Brubaker 2018-03-20 09:34:02 -07:00
parent 2e54d2b4ef
commit a0afbe4a29
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ControlElements/TextImageButtonFactory.cs
View file

@ -122,10 +122,10 @@ namespace MatterHackers.MatterControl
{
// Create button based on view container widget
var buttonViewWidget = new ButtonViewStates(
new TextImageWidget(label, normalFillColor, normalBorderColor, normalTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing),
new TextImageWidget(label, hoverFillColor, hoverBorderColor, hoverTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing),
new TextImageWidget(label, pressedFillColor, pressedBorderColor, pressedTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing),
new TextImageWidget(label, disabledFillColor, disabledBorderColor, disabledTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight, imageSpacing: ImageSpacing)
new TextImageWidget(label, normalFillColor, normalBorderColor, normalTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing),
new TextImageWidget(label, hoverFillColor, hoverBorderColor, hoverTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing),
new TextImageWidget(label, pressedFillColor, pressedBorderColor, pressedTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing),
new TextImageWidget(label, disabledFillColor, disabledBorderColor, disabledTextColor, borderWidth, Margin, null, fontSize: this.fontSize, height: this.FixedHeight * GuiWidget.DeviceScale, imageSpacing: ImageSpacing)
);
var textImageButton = new Button(0, 0, buttonViewWidget)

4
PartPreviewWindow/View3D/ColorSwatchSelector.cs
View file

@ -91,8 +91,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var colorWidget = new GuiWidget()
{
BackgroundColor = color,
Width = buttonSize,
Height = buttonSize,
Width = buttonSize * GuiWidget.DeviceScale,
Height = buttonSize * GuiWidget.DeviceScale,
Margin = buttonSpacing
};

2
PartPreviewWindow/View3D/TumbleCubeControl.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Vector2 lastMovePosition;
public TumbleCubeControl(InteractionLayer interactionLayer)
: base(100, 100)
: base(100 * GuiWidget.DeviceScale, 100 * GuiWidget.DeviceScale)
{
this.interactionLayer = interactionLayer;

2
RootSystemWindow.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
{
public class RootSystemWindow : SystemWindow
{
private static Vector2 minSize { get; set; } = new Vector2(600, 600);
private static Vector2 minSize { get; set; } = new Vector2(600, 480);
private Stopwatch totalDrawTime = new Stopwatch();