summaryrefslogtreecommitdiffstats
path: root/src/controls/Styles/Desktop/ComboBoxStyle.qml
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usageAntti Kokko2016-02-041-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Controls: update license headersJ-P Nurmi2015-02-111-28/+25
| | | | | | | Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Correct sizing of combobox itemsMarco Martin2014-11-041-2/+2
| | | | | | | | | | | | | | | | | | The qstyle can set as preferred size for itemview items a different size than the text height depending from the result of sizeFromContents( CT_ItemViewItem, .. Examples of styles that do this, are Oxygen and Breeze, in order to have a bit more spacing. This makes the combobox render incorrectly. This patch makes use of the size hint of the qstyle instead of the text height. Since the height can be more than the font height, the text (and optional icon) are now drawn vertically centered in the delegate. Change-Id: I898d85c994d5760979750c2f3a5dafd83f1e3cbd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ComboBox: respect style padding for the editorJ-P Nurmi2014-07-281-0/+1
| | | | | | | | | | | | | | Get rid of the hard coded 8px left margin and use whatever value the style supplies (and is already used for the label). This allows the Android style to provide a sensible value for High DPI screens. The new value for the left margin is 6px in Base and Desktop styles. It looks slightly better, but still not pixel perfect. Notice that the text label of editable and non-editable ComboBoxes are not perfectly aligned in native Windows and OS X ComboBoxes either. Change-Id: I9a66c3a26fcd9ef1653b355e831277a7b6cbe72f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* ComboBox: query font & colors via style panelJ-P Nurmi2014-07-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advanced custom styles have difficulties binding values from native styling elements to the style root, because such styling elements are created inside delegate components. ComboBoxStyle { id: style panel: Item { NativeStyle { id: native elementType: "ComboBox" } // typical "backwards" bindings that we want to avoid: Binding { target: style; property: "font"; value: native.font } Binding { target: style; property: "foo"; value: native.foo } Binding { target: style; property: "bar"; value: native.bar } // ... } } Becomes: ComboBoxStyle { id: style panel: Item { NativeStyle { id: native elementType: "ComboBox" } font: native.font foo: native.foo bar: native.bar // ... } } Change-Id: I23a3a6528cf0162dc91f94a44bcade2985260a9d Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* ComboBoxStyle: allow specifying text & selection colorsJ-P Nurmi2014-07-121-0/+3
| | | | | | | The system palette colors are not suitable for all styles. Change-Id: I326e57a3bac9c11dab9a40d1e4c933fc534e7ada Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* ComboBox style: Remove old API in desktop drop-down frameGabriel de Dietrich2014-04-281-5/+8
| | | | | | | | | | | The contentWidth, contentHeight properties no longer exist. We should use padding instead. Task-number: QTBUG-38054 Change-Id: I0e2574a5b17e12b9e43a3ab42e86ce38a31fff84 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-071-1/+1
| | | | | Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Import QtQuick 2.2J-P Nurmi2014-04-071-1/+1
| | | | | Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ComboBox: fix a warning in MenuContentItemJ-P Nurmi2014-03-181-0/+1
| | | | | Change-Id: I8428d7e2f768cd7341ecb3efcc52fc2dba1d0ca0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Introducing styling for Menu, MenuBarGabriel de Dietrich2014-02-141-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | MenuStyle We expose the frame and item properties together with some convenience properties (basically color related). The menu item data is exposed via a styleData object, similarly to what's done in TabViewStyle. In addition, we introduce MenuStyle.menuItem which brings some convenience when it comes to overriding subcontrols of the menu item. MenuBarStyle We expose background and menuBarItem. The menubar item's properties are accessible through the styleData property in scope. Style cascading Additionally, MenuBarStyle has a menuStyle property that will apply to all its menus and their submenus. Similarly, assigning a style to a Menu object, will apply it to its submenus. It's still possible to override the parent menu's style by declaring its own. [ChangeLog][QtQuickControls][Styles]Menu and MenuBar are now styleable Change-Id: Ib724b7a6426bdfce5da314620d51dfaa76f76500 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/controls/Styles/Base/ComboBoxStyle.qml src/controls/Styles/Desktop/ComboBoxStyle.qml src/layouts/qgridlayoutengine.cpp Change-Id: I14298b9b3521fe220248e4b27e7057d538af5c49
| * Fix typo in property in ComboBoxStyleDavid Edmundson2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | drowDownButtonWidth seems to be a typo in an exposed property name. In order to keep compatibility an (undocumented) alias is added. Change-Id: I2ab04b3518325e339c31cf6f403c488256a4aabe Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Add ComboBoxStyle::renderTypeJ-P Nurmi2013-11-271-0/+1
|/ | | | | Change-Id: I59c145d0826926b096faae7b01390e9201b5e28f Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* More styling improvements for Base StyleJens Bache-Wiig2013-10-311-0/+1
| | | | | | | | | | - Better scalability - Retina support - Added glow filter to Private - Added focus rects Change-Id: I2ec36a9db546c21e20408429c5e17fde8d67b7c3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Pick up baselineOffset from the style.Jan Arve Saether2013-09-201-0/+1
| | | | | Change-Id: I126fd3d9b399fa3a7c62685060fd49b1cea4df62 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* ComboBox: Make popup scrollableGabriel de Dietrich2013-09-191-0/+8
| | | | | | | | | | | | | | | | We factor out part the menu item container logic from Menu into ColumnMenuContent, which takes care of scrolling and mouse hovering, and selection. This makes possible to extend the menu items layout. The pop-over and pull-down look is specified by the menu style component by overriding the ScrollView style. The popup's maximum height is also specified by the menu style. The gallery example can finally use a font families combo box. Task-number: QTBUG-31568 Change-Id: I34a7278f476471c0eb51ef51dde3dd83e13002fe Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Make ComboBox editableJens Bache-Wiig2013-09-171-2/+3
| | | | | | | | | | | | | | | | | | In addition - Added text completion - Added validator - Added accepted signal - Added activated signal - Added textAt function - Added find function - Added keyboard indexing for non-editable as well Note that we do not support adding values to the model, but leave this up to the user to handle in onAccepted. Change-Id: I1d76fa83aea0e488959c418d22ce7b6027675d86 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-101-2/+2
| | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Move Styles and Private under controlsCaroline Chao2013-08-161-0/+110
Register the C++ private API from the controls plugin. The private plugin is not needed anymore. The Controls "submodules" Styles and Private are moved to the controls subfolder in the sources tree. Change-Id: I98358227c945b6cd1a8dbff9d07e6cad4f044277 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>