Merge branch '2.9'

Author: hansu

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -5187,11 +5187,11 @@ def on_IconFileSelection1_exit(self, widget):
 
     # edit a program or make a new one
     def on_btn_edit_clicked(self, widget, data=None):
-        self.hbox2_position = self.widgets.hbox2.get_position()
         self.widgets.ntb_button.set_current_page(_BB_EDIT)
         self.widgets.ntb_preview.hide()
         self.widgets.grid_DRO.hide()
         self.widgets.vbox14.hide()
+        self.widgets.vbox_jog.set_hexpand(True)
         self.widgets.box_dro_side.hide()
         if not self.widgets.vbx_jog.get_visible():
             self.widgets.vbx_jog.set_visible(True)
@@ -5270,8 +5270,8 @@ def on_ntb_button_switch_page(self, *args):
             self.widgets.ntb_preview.show()
             self.widgets.grid_DRO.show()
             self.widgets.vbox14.show()
+            self.widgets.vbox_jog.set_hexpand(False)
             self.widgets.box_dro_side.show()
-            self.widgets.hbox2.set_position(self.hbox2_position)
             self.widgets.gcode_view.set_sensitive(False)
             self.widgets.btn_save.set_sensitive(True)
             self.widgets.hal_action_reload.emit("activate")