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

Moving keyboard offset to common base class

Browse source
This commit is contained in:
Lars Brubaker 2016-12-12 13:32:10 -08:00
parent 52fcf0e720
commit 03e1fee901
12 changed files with 2 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AboutPage/ContactForm.cs
View file

@ -326,11 +326,7 @@ namespace MatterHackers.MatterControl.ContactForm
contactFormWidget = new ContactFormWidget(subject, bodyText);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(contactFormWidget));
#else
AddChild(contactFormWidget);
#endif
AddHandlers();
ShowAsSystemWindow();

2
ActionBar/PrinterSelector.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl
}
var menuItem = this.AddItem(StaticData.Instance.LoadIcon("icon_plus.png", 32, 32), "Add New Printer...", "new");
menuItem.Selectable = false;
menuItem.CanHeldSelection = false;
menuItem.Click += (s, e) =>
{
if (AddPrinter != null)

4
BrailleBuilder/BrailleBuilderMainWindow.cs
View file

@ -52,11 +52,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
ActiveSliceSettings.Instance.GetValue<Vector2>(SettingsKey.print_center),
ActiveSliceSettings.Instance.GetValue<BedShape>(SettingsKey.bed_shape));
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(part3DView));
#else
this.AddChild(part3DView);
#endif
this.AnchorAll();

1
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -524,7 +524,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
LocalizedString.ResetTranslationMap();
ApplicationController.Instance.MainView = new TouchscreenView();
app.RemoveAllChildren();
app.AddChild(new SoftKeyboardContentOffset(ApplicationController.Instance.MainView));
app.AnchorAll();
#endif
});

4
EeProm/EePromMarlinWindow.cs
View file

@ -266,11 +266,7 @@ namespace MatterHackers.MatterControl.EeProm
PrinterConnectionAndCommunication.Instance.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(mainContainer));
#else
AddChild(mainContainer);
#endif
ShowAsSystemWindow();

4
EeProm/EePromRepetierWindow.cs
View file

@ -184,11 +184,7 @@ namespace MatterHackers.MatterControl.EeProm
topToBottom.AddChild(buttonBar);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(topToBottom));
#else
this.AddChild(topToBottom);
#endif
Title = LocalizedString.Get("Firmware EEPROM Settings");

4
PartPreviewWindow/PartPreviewMainWindow.cs
View file

@ -57,11 +57,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Close();
};
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(partPreviewWidget));
#else
this.AddChild(partPreviewWidget);
#endif
AddHandlers();

4
PartPreviewWindow/SaveAsWindow.cs
View file

@ -145,11 +145,7 @@ namespace MatterHackers.MatterControl
topToBottom.AddChild(buttonRow);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(topToBottom));
#else
this.AddChild(topToBottom);
#endif
ShowAsSystemWindow();
}

4
PrinterControls/TerminalWindow/TerminalWindow.cs
View file

@ -96,11 +96,7 @@ namespace MatterHackers.MatterControl
: base(width, height)
{
AlwaysOnTopOfMain = true;
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(new TerminalWidget(true)));
#else
this.AddChild(new TerminalWidget(true));
#endif
Title = LocalizedString.Get("MatterControl - Terminal");
this.ShowAsSystemWindow();
MinimumSize = minSize;

4
SetupWizard/WizardWindow.cs
View file

@ -162,11 +162,7 @@ namespace MatterHackers.MatterControl
{
pageToChangeTo.WizardWindow = this;
this.CloseAllChildren();
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(pageToChangeTo));
#else
this.AddChild(pageToChangeTo);
#endif
this.Invalidate();
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit f676c35a6660435156d8069da691ddedff8e2aee
Subproject commit 83ec53c0dc4ecf1068973c6f7ab04159995a13b6

4
TextCreator/TextCreatorMainWindow.cs
View file

@ -52,11 +52,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
ActiveSliceSettings.Instance.GetValue<Vector2>(SettingsKey.print_center),
ActiveSliceSettings.Instance.GetValue<BedShape>(SettingsKey.bed_shape));
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(part3DView));
#else
this.AddChild(part3DView);
#endif
this.AnchorAll();