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

Revise Android softkeyboard support

Browse source 
- Remove keyboardHeight from constructor
 - Latest agg
This commit is contained in:
John Lewin 2015-10-13 10:17:11 -07:00
parent d720abac42
commit 1380ea0c43
11 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AboutPage/ContactForm.cs
View file

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

2
BrailleBuilder/BrailleBuilderMainWindow.cs
View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
ActiveSliceSettings.Instance.BedShape);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(part3DView, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(part3DView));
#else
this.AddChild(part3DView);
#endif

2
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

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

2
EeProm/EePromMarlinWindow.cs
View file

@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.EeProm
#if __ANDROID__
TerminalWidget terminalWidget = new TerminalWidget(true);
this.AddChild(new SoftKeyboardContentOffset(mainContainer, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(mainContainer));
//mainContainer.Closed += (sender, e) => { Close(); };
#else
AddChild(mainContainer);

2
EeProm/EePromRepetierWindow.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.EeProm
#if __ANDROID__
TerminalWidget terminalWidget = new TerminalWidget(true);
this.AddChild(new SoftKeyboardContentOffset(topToBottom, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(topToBottom));
//topToBottom.Closed += (sender, e) => { Close(); };
#else
this.AddChild(topToBottom);

2
PartPreviewWindow/PartPreviewMainWindow.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
#if __ANDROID__
TerminalWidget terminalWidget = new TerminalWidget(true);
this.AddChild(new SoftKeyboardContentOffset(partPreviewWidget, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(partPreviewWidget));
//mainContainer.Closed += (sender, e) => { Close(); };
#else
this.AddChild(partPreviewWidget);

2
PartPreviewWindow/SaveAsWindow.cs
View file

@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl
topToBottom.AddChild(buttonRow);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(topToBottom, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(topToBottom));
#else
this.AddChild(topToBottom);
#endif

2
PrinterControls/PrinterConnections/EditConnectionWidget.cs
View file

@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
mainContainer.AddChild(buttonContainer);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(mainContainer, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(mainContainer));
#else
this.AddChild(mainContainer);
#endif

2
PrinterControls/TerminalWindow/TerminalWindow.cs
View file

@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl
AlwaysOnTopOfMain = true;
#if __ANDROID__
TerminalWidget terminalWidget = new TerminalWidget(true);
this.AddChild(new SoftKeyboardContentOffset(terminalWidget, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(terminalWidget));
terminalWidget.Closed += (sender, e) => { Close(); };
#else
this.AddChild(new TerminalWidget(true));

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 8ddc271e27290492eff02d0bc7e30b1768c81459
Subproject commit a0a0f876162678299b6b1d8aecd1c777694ff58a

2
TextCreator/TextCreatorMainWindow.cs
View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
ActiveSliceSettings.Instance.BedShape);
#if __ANDROID__
this.AddChild(new SoftKeyboardContentOffset(part3DView, SoftKeyboardContentOffset.AndroidKeyboardOffset));
this.AddChild(new SoftKeyboardContentOffset(part3DView));
#else
this.AddChild(part3DView);
#endif