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

Remove extra scaling, special styling, for touchscreen

Browse source 
- Issue MatterHackers/MCCentral#2334
Create folder is not open to right size
This commit is contained in:
John Lewin 2017-12-11 21:09:40 -08:00
parent 19811da81d
commit ebea5a5bdb
9 changed files with 24 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ControlElements/StyledMessageBoxWindow.cs
View file

@ -60,8 +60,6 @@ namespace MatterHackers.MatterControl
private TextWidget messageContainer;
private Action<bool> responseCallback;
private double extraTextScaling = (UserSettings.Instance.IsTouchScreen) ? 1.33333 : 1;
public MessageBoxPage(Action<bool> callback, string message, string caption, MessageType messageType, GuiWidget[] extraWidgetsToAdd, double width, double height, string yesOk, string noCancel, ThemeConfig theme)
: base((noCancel == "") ? "No".Localize() : noCancel)
{
@ -78,7 +76,7 @@ namespace MatterHackers.MatterControl
responseCallback = callback;
unwrappedMessage = message;
contentRow.AddChild(messageContainer = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 12 * extraTextScaling)
contentRow.AddChild(messageContainer = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 12 * DeviceScale)
{
AutoExpandBoundsToText = true,
HAnchor = HAnchor.Left
@ -137,7 +135,7 @@ namespace MatterHackers.MatterControl
double wrappingSize = contentRow.Width - (contentRow.Padding.Width + messageContainer.Margin.Width);
if (wrappingSize > 0)
{
var wrapper = new EnglishTextWrapping(12 * extraTextScaling * GuiWidget.DeviceScale);
var wrapper = new EnglishTextWrapping(12 * GuiWidget.DeviceScale);
messageContainer.Text = wrapper.InsertCRs(unwrappedMessage, wrappingSize);
}
}