From 71af2e5d827c78df85537ea8d9e1c8198c583db2 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 16 Apr 2018 13:38:07 -0700 Subject: [PATCH] Revise conditional compilation block --- SetupWizard/DialogPage.cs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/SetupWizard/DialogPage.cs b/SetupWizard/DialogPage.cs index f3cba11fd..a0068a571 100644 --- a/SetupWizard/DialogPage.cs +++ b/SetupWizard/DialogPage.cs @@ -122,21 +122,18 @@ namespace MatterHackers.MatterControl mainContainer.AddChild(contentRow); mainContainer.AddChild(footerRow); -#if __ANDROID__ - if (false) +#if !__ANDROID__ + mainContainer.Padding = new BorderDouble(3, 5, 3, 0); + headerRow.Padding = new BorderDouble(0, 3, 0, 3); + + headerLabel.TextWidget.PointSize = 14; + headerLabel.TextColor = theme.Colors.PrimaryTextColor; + contentRow.Padding = new BorderDouble(5); + + // TODO: current layout bugs prevent bottom margin from having an effect and bounds are simply clipped + footerRow.Margin = new BorderDouble(top: theme.DefaultContainerPadding, bottom: 4); + footerRow.Padding = 0; #endif - { - mainContainer.Padding = new BorderDouble(3, 5, 3, 0); - headerRow.Padding = new BorderDouble(0, 3, 0, 3); - - headerLabel.TextWidget.PointSize = 14; - headerLabel.TextColor = theme.Colors.PrimaryTextColor; - contentRow.Padding = new BorderDouble(5); - - // TODO: current layout bugs prevent bottom margin from having an effect and bounds are simply clipped - footerRow.Margin = new BorderDouble(top: theme.DefaultContainerPadding, bottom: 4); - footerRow.Padding = 0; - } this.AddChild(mainContainer); }