From 12a70d57c2903ccdd37fbfc7ccc7733b977a232d Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 4 Mar 2018 17:24:52 +0100 Subject: [PATCH 1/5] Set Y pos for indicator explicetly --- interface/resources/qml/controls-uit/CheckBox.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml index e60f646327..00853ecf6c 100644 --- a/interface/resources/qml/controls-uit/CheckBox.qml +++ b/interface/resources/qml/controls-uit/CheckBox.qml @@ -42,6 +42,7 @@ Original.CheckBox { style: CheckBoxStyle { indicator: Rectangle { id: box + y: (checkBox.height - height) / 2 width: boxSize height: boxSize radius: boxRadius @@ -101,8 +102,8 @@ Original.CheckBox { } label: Label { - text: control.text - color: control.color + text: checkBox.text + color: checkBox.color x: 2 wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight From 1d43ca48bd77241d222fbce38eb6a62cf578f946 Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 4 Mar 2018 17:59:56 +0100 Subject: [PATCH 2/5] remove wrap --- interface/resources/qml/controls-uit/CheckBox.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml index 00853ecf6c..61e5d0c0f0 100644 --- a/interface/resources/qml/controls-uit/CheckBox.qml +++ b/interface/resources/qml/controls-uit/CheckBox.qml @@ -105,8 +105,8 @@ Original.CheckBox { text: checkBox.text color: checkBox.color x: 2 - wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap - elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight + //wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap + //elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight enabled: checkBox.enabled } } From 9f151566bf30e58c51e064ac0320395c0df899b4 Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 4 Mar 2018 18:46:27 +0100 Subject: [PATCH 3/5] temporarily remove styling --- interface/resources/qml/controls-uit/CheckBox.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml index 61e5d0c0f0..5001102360 100644 --- a/interface/resources/qml/controls-uit/CheckBox.qml +++ b/interface/resources/qml/controls-uit/CheckBox.qml @@ -38,7 +38,7 @@ Original.CheckBox { // onHovered: { // Tablet.playSound(TabletEnums.ButtonHover); // } - +/* style: CheckBoxStyle { indicator: Rectangle { id: box @@ -105,9 +105,9 @@ Original.CheckBox { text: checkBox.text color: checkBox.color x: 2 - //wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap - //elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight + wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap + elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight enabled: checkBox.enabled } - } + }*/ } From c2c7962f66d8d6f94304d86158463343ce6946af Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 4 Mar 2018 19:49:47 +0100 Subject: [PATCH 4/5] return styling. set implicit sizes --- interface/resources/qml/controls-uit/CheckBox.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml index 5001102360..02bb9aacc9 100644 --- a/interface/resources/qml/controls-uit/CheckBox.qml +++ b/interface/resources/qml/controls-uit/CheckBox.qml @@ -38,13 +38,13 @@ Original.CheckBox { // onHovered: { // Tablet.playSound(TabletEnums.ButtonHover); // } -/* + style: CheckBoxStyle { indicator: Rectangle { id: box - y: (checkBox.height - height) / 2 - width: boxSize - height: boxSize + //y: (checkBox.height - height) / 2 + implicitWidth: boxSize + implicitHeight: boxSize radius: boxRadius border.width: 1 border.color: pressed || hovered @@ -109,5 +109,5 @@ Original.CheckBox { elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight enabled: checkBox.enabled } - }*/ + } } From 43e7f282ec562cfb0e4f9ba2fd0c22c2978954fe Mon Sep 17 00:00:00 2001 From: vladest Date: Sun, 4 Mar 2018 20:44:46 +0100 Subject: [PATCH 5/5] cleanup --- interface/resources/qml/controls-uit/CheckBox.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml index 02bb9aacc9..973bbee60e 100644 --- a/interface/resources/qml/controls-uit/CheckBox.qml +++ b/interface/resources/qml/controls-uit/CheckBox.qml @@ -42,7 +42,6 @@ Original.CheckBox { style: CheckBoxStyle { indicator: Rectangle { id: box - //y: (checkBox.height - height) / 2 implicitWidth: boxSize implicitHeight: boxSize radius: boxRadius