Commit bdcbe943 authored by Benjamin Mummery's avatar Benjamin Mummery 💻

Updated scaling for spinboxes

parent 4ba39441
......@@ -312,10 +312,10 @@ class labelledSpin(QtWidgets.QWidget):
if x is not None:
self.setFixedWidth(x)
x_widget = int(x / 4 - spacing)
self.nameLabel.setFixedWidth(x_widget)
self.simpleSpin.setFixedWidth(2 * x_widget)
self.unitLabel.setFixedWidth(x_widget)
x_widget = int(x / 8)
self.nameLabel.setFixedWidth(3 * x_widget - spacing)
self.simpleSpin.setFixedWidth(3 * x_widget - spacing)
self.unitLabel.setFixedWidth(2 * x_widget - spacing)
if y is not None:
self.setFixedHeight(y)
for widget in self.widgetList:
......
......@@ -167,7 +167,7 @@ class Layout:
vlayout.addWidget(widget)
widget.setFont(self.NativeUI.text_font)
widget.set_size(
int(self.screen_width / 2 - self.widget_spacing),
int(panel_width - self.widget_spacing),
self.min_button_height,
spacing=self.widget_spacing,
)
......@@ -176,6 +176,7 @@ class Layout:
# self.widgets.alarm_control_startup.set_size(None, self.min_button_height)
widg = LocalisedQWidget()
widg.setLayout(vlayout)
widg.setFixedWidth(panel_width)
return widg
def global_layout(self):
......
......@@ -146,10 +146,11 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
if x is not None:
self.setFixedWidth(x)
x_widget = int(x / 4 - spacing)
self.nameLabel.setFixedWidth(x_widget)
self.simpleSpin.setFixedWidth(2 * x_widget)
self.unitLabel.setFixedWidth(x_widget)
x_widget = int(x / 8)
print(self.label)
self.nameLabel.setFixedWidth(3 * x_widget - spacing)
self.simpleSpin.setFixedWidth(3 * x_widget - spacing)
self.unitLabel.setFixedWidth(2 * x_widget - spacing)
if y is not None:
self.setFixedHeight(y)
for widget in self.widgetList:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment