From 0b5654f870be0dbf9b9464b72097aec29d65e23a Mon Sep 17 00:00:00 2001 From: BenDol Date: Sun, 13 Jul 2014 07:38:11 +1200 Subject: [PATCH] Style fixes and added dontSignal to UIRadioGroup. --- data/styles/10-textedits.otui | 1 + data/styles/20-spinboxes.otui | 6 +++--- modules/corelib/ui/uiradiogroup.lua | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/data/styles/10-textedits.otui b/data/styles/10-textedits.otui index 1e176996..b5d09bcc 100644 --- a/data/styles/10-textedits.otui +++ b/data/styles/10-textedits.otui @@ -3,6 +3,7 @@ TextEdit < UITextEdit color: #272727 size: 86 22 text-offset: 0 4 + opacity: 1 padding: 4 image-source: /images/ui/textedit image-border: 1 diff --git a/data/styles/20-spinboxes.otui b/data/styles/20-spinboxes.otui index 61461be7..1ceddf4d 100644 --- a/data/styles/20-spinboxes.otui +++ b/data/styles/20-spinboxes.otui @@ -1,13 +1,13 @@ SpinBox < TextEdit __class: UISpinBox text-align: left - size: 86 20 + size: 86 22 padding: 0 padding-left: 2 Button id: up - size: 10 10 + size: 11 11 image-source: /images/ui/spinbox_up image-border: 1 image-clip: 0 0 10 10 @@ -21,7 +21,7 @@ SpinBox < TextEdit Button id: down - size: 10 10 + size: 11 11 image-source: /images/ui/spinbox_down image-border: 1 image-clip: 0 0 10 10 diff --git a/modules/corelib/ui/uiradiogroup.lua b/modules/corelib/ui/uiradiogroup.lua index 701d6559..682aece9 100644 --- a/modules/corelib/ui/uiradiogroup.lua +++ b/modules/corelib/ui/uiradiogroup.lua @@ -28,7 +28,7 @@ function UIRadioGroup:removeWidget(widget) table.removevalue(self.widgets, widget) end -function UIRadioGroup:selectWidget(selectedWidget) +function UIRadioGroup:selectWidget(selectedWidget, dontSignal) if selectedWidget == self.selectedWidget then return end local previousSelectedWidget = self.selectedWidget @@ -42,7 +42,9 @@ function UIRadioGroup:selectWidget(selectedWidget) selectedWidget:setChecked(true) end - signalcall(self.onSelectionChange, self, selectedWidget, previousSelectedWidget) + if not dontSignal then + signalcall(self.onSelectionChange, self, selectedWidget, previousSelectedWidget) + end end function UIRadioGroup:clearSelected()