From a13dce3d471c77474ce4b0f6bae115a015139229 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 30 Dec 2016 12:09:02 +0100 Subject: Material: fix ComboBox drop indicator size on high-DPI qtdeclarative commit f8c53e88 (Fix high-DPI image and svg providers) changed the way high-DPI image providers work. For images using an image provider, we must now set the source size to get the desired device pixel ratio... The same was done for other indicators in qqc2 commit ca87ab8. Change-Id: I31f24786a6d3d3d06c3255864ed443cf8852a8de Task-number: QTBUG-57800 Reviewed-by: Mitch Curtis --- src/imports/controls/material/ComboBox.qml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/imports/controls') diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 15987ebc..a0fdef66 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -74,6 +74,8 @@ T.ComboBox { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 source: "image://material/drop-indicator/" + (control.enabled ? control.Material.foreground : control.Material.hintTextColor) + sourceSize.width: width + sourceSize.height: height } contentItem: Text { -- cgit v1.2.3 From 23c7e1877eef6b5fe0f93ee95bcc725ad4177f30 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 17 Jan 2017 13:07:34 +0100 Subject: Adding round button to designer item library Change-Id: I6409a7036392af7bd160583a9d92982ce9876eac Reviewed-by: Mitch Curtis Reviewed-by: J-P Nurmi --- src/imports/controls/designer/images/roundbutton-icon.png | Bin 0 -> 223 bytes .../controls/designer/images/roundbutton-icon16.png | Bin 0 -> 178 bytes .../controls/designer/images/roundbutton-icon16@2x.png | Bin 0 -> 219 bytes .../controls/designer/images/roundbutton-icon@2x.png | Bin 0 -> 310 bytes src/imports/controls/designer/qtquickcontrols2.metainfo | 14 ++++++++++++++ 5 files changed, 14 insertions(+) create mode 100644 src/imports/controls/designer/images/roundbutton-icon.png create mode 100644 src/imports/controls/designer/images/roundbutton-icon16.png create mode 100644 src/imports/controls/designer/images/roundbutton-icon16@2x.png create mode 100644 src/imports/controls/designer/images/roundbutton-icon@2x.png (limited to 'src/imports/controls') diff --git a/src/imports/controls/designer/images/roundbutton-icon.png b/src/imports/controls/designer/images/roundbutton-icon.png new file mode 100644 index 00000000..35d28fab Binary files /dev/null and b/src/imports/controls/designer/images/roundbutton-icon.png differ diff --git a/src/imports/controls/designer/images/roundbutton-icon16.png b/src/imports/controls/designer/images/roundbutton-icon16.png new file mode 100644 index 00000000..5dc3a895 Binary files /dev/null and b/src/imports/controls/designer/images/roundbutton-icon16.png differ diff --git a/src/imports/controls/designer/images/roundbutton-icon16@2x.png b/src/imports/controls/designer/images/roundbutton-icon16@2x.png new file mode 100644 index 00000000..10c13149 Binary files /dev/null and b/src/imports/controls/designer/images/roundbutton-icon16@2x.png differ diff --git a/src/imports/controls/designer/images/roundbutton-icon@2x.png b/src/imports/controls/designer/images/roundbutton-icon@2x.png new file mode 100644 index 00000000..81150e3d Binary files /dev/null and b/src/imports/controls/designer/images/roundbutton-icon@2x.png differ diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo index c697b3c2..c4b7e8d5 100644 --- a/src/imports/controls/designer/qtquickcontrols2.metainfo +++ b/src/imports/controls/designer/qtquickcontrols2.metainfo @@ -440,4 +440,18 @@ MetaInfo { Property { name: "text"; type: "binding"; value: "qsTr(\"Tab Button\")" } } } + + Type { + name: "QtQuick.Controls.RoundButton" + icon: "images/roundbutton-icon16.png" + + ItemLibraryEntry { + name: "Round Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/roundbutton-icon.png" + version: "2.1" + requiredImport: "QtQuick.Controls" + Property { name: "text"; type: "string"; value: "+" } + } + } } -- cgit v1.2.3 From c1b1e9a69a5770a59d0a4e59650c6487b9cd5439 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 17 Jan 2017 12:03:47 +0100 Subject: Adding stack view and swipe view to designer item library Adding stack view and swipe view to the view category. The icons are taken from stack layout and have no high dpi versions. Change-Id: I4009a9d06117bdd5d725c1c05c46ce7f99c368b5 Reviewed-by: J-P Nurmi --- .../controls/designer/images/stackview-icon.png | Bin 0 -> 157 bytes .../controls/designer/images/stackview-icon16.png | Bin 0 -> 147 bytes .../controls/designer/images/swipeview-icon.png | Bin 0 -> 157 bytes .../controls/designer/images/swipeview-icon16.png | Bin 0 -> 147 bytes .../controls/designer/qtquickcontrols2.metainfo | 32 +++++++++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 src/imports/controls/designer/images/stackview-icon.png create mode 100644 src/imports/controls/designer/images/stackview-icon16.png create mode 100644 src/imports/controls/designer/images/swipeview-icon.png create mode 100644 src/imports/controls/designer/images/swipeview-icon16.png (limited to 'src/imports/controls') diff --git a/src/imports/controls/designer/images/stackview-icon.png b/src/imports/controls/designer/images/stackview-icon.png new file mode 100644 index 00000000..bbd6783c Binary files /dev/null and b/src/imports/controls/designer/images/stackview-icon.png differ diff --git a/src/imports/controls/designer/images/stackview-icon16.png b/src/imports/controls/designer/images/stackview-icon16.png new file mode 100644 index 00000000..3f7ab00c Binary files /dev/null and b/src/imports/controls/designer/images/stackview-icon16.png differ diff --git a/src/imports/controls/designer/images/swipeview-icon.png b/src/imports/controls/designer/images/swipeview-icon.png new file mode 100644 index 00000000..bbd6783c Binary files /dev/null and b/src/imports/controls/designer/images/swipeview-icon.png differ diff --git a/src/imports/controls/designer/images/swipeview-icon16.png b/src/imports/controls/designer/images/swipeview-icon16.png new file mode 100644 index 00000000..3f7ab00c Binary files /dev/null and b/src/imports/controls/designer/images/swipeview-icon16.png differ diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo index c4b7e8d5..35cfa0f2 100644 --- a/src/imports/controls/designer/qtquickcontrols2.metainfo +++ b/src/imports/controls/designer/qtquickcontrols2.metainfo @@ -454,4 +454,36 @@ MetaInfo { Property { name: "text"; type: "string"; value: "+" } } } + + Type { + name: "QtQuick.Controls.StackView" + icon: "images/stackview-icon16.png" + + ItemLibraryEntry { + name: "stack View" + category: "Qt Quick - Views" + libraryIcon: "images/stackview-icon.png" + version: "2.1" + requiredImport: "QtQuick.Controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.SwipeView" + icon: "images/swipeview-icon16.png" + + ItemLibraryEntry { + name: "Swipe View" + category: "Qt Quick - Views" + libraryIcon: "images/swipeview-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } } -- cgit v1.2.3