From 5519eeef980570c2bb4fb80ade2535da396fee3a Mon Sep 17 00:00:00 2001
From: supermerill <merill@free.fr>
Date: Wed, 11 Nov 2020 22:20:12 +0100
Subject: [PATCH] #657 UI niggles & full_width

---
 resources/ui_layout/print.ui     | 8 ++++----
 src/slic3r/GUI/OG_CustomCtrl.cpp | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/resources/ui_layout/print.ui b/resources/ui_layout/print.ui
index d85ffd855..4e1a0c790 100644
--- a/resources/ui_layout/print.ui
+++ b/resources/ui_layout/print.ui
@@ -18,7 +18,7 @@ group:Horizontal shells
 group:Quality
 	line:Only one perimeter on Top surfaces
 		setting:label$ :only_one_perimeter_top
-		setting:label$Minimum width:min_width_top_surface
+		setting:label$Minimum width:sidetext_width$7:min_width_top_surface
 	end_line
 	line:Extra perimeters
 		setting:extra_perimeters_overhangs
@@ -201,7 +201,7 @@ group:Options for support material interface
 	setting:support_material_interface_contact_loops
 
 page:Speed:time
-group:label_width$8:Speed for print moves
+group:label_width$8:sidetext_width$7:Speed for print moves
 	line:Perimeter speed
 		setting:width$4:perimeter_speed
 		setting:width$4:external_perimeter_speed
@@ -227,7 +227,7 @@ group:label_width$8:Speed for print moves
 	setting:label$Ironing post-process speed:label_width$30:width$4:ironing_speed
 group:Speed for non-print moves
 	setting:travel_speed
-group:Modifiers
+group:sidetext_width$7:Modifiers
 	line:First layer speed
 		setting:label_width$8:width$4:first_layer_speed
 		setting:label_width$8:width$4:first_layer_infill_speed
@@ -264,7 +264,7 @@ group:Overlap
 		setting:label$External:external_perimeter_overlap
 		setting:label$Gap Fill:gap_fill_overlap
 	end_line
-	setting:infill_overlap
+	setting:sidetext_width$7:infill_overlap
 	setting:bridge_overlap
 group:Flow
 	line:Flow ratio
diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp
index 69ce9aee2..48638fc03 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.cpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.cpp
@@ -539,7 +539,13 @@ void OG_CustomCtrl::CtrlLine::render(wxDC& dc, wxCoord v_pos)
         option_set.front().side_widget == nullptr && og_line.get_extra_widgets().size() == 0)
     {
         if (field && field->undo_to_sys_bitmap())
-            draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->bmp(), field->undo_bitmap()->bmp(), field->blink());
+            h_pos = draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->bmp(), field->undo_bitmap()->bmp(), field->blink());
+        h_pos += ctrl->m_h_gap;
+        //check for full_width width
+        if (option_set.front().opt.full_width) {
+            if (field->getWindow())
+                field->getWindow()->SetSize(this->ctrl->GetSize().x - h_pos, -1);
+        }
         return;
     }