summaryrefslogtreecommitdiffstats
path: root/src/private
Commit message (Collapse)AuthorAgeFilesLines
* Move Styles and Private under controlsCaroline Chao2013-08-1633-5808/+0
| | | | | | | | | | | 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>
* Request an atlas textureGunnar Sletta2013-08-141-1/+1
| | | | | Change-Id: I039730c4146c599e61cb726517271b59e9ed3622 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2013-08-132-17/+34
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-122-17/+34
| |\ | | | | | | | | | Change-Id: Id126639ad0392d421bd209a4f27df79f4e31dabd
| | * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-091-1/+6
| | |\ | | | | | | | | | | | | Change-Id: I073b2bd7ca1973139a901d431408d0462ba0bd45
| | | * QQuickTooltip should not crash if widget implementation isn't possibleShawn Rutledge2013-08-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not enough to check for QT_NO_WIDGETS because it can fail at runtime if the app was launched with a QGuiApplication or you are on a platform without multiple-window support. Task-number: QTBUG-32779 Change-Id: I13abf9a5063f7d91277bc52b8be79bee19e746af Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * | ScrollBar: support wheel scrollingJ-P Nurmi2013-08-061-16/+28
| | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-32763 Change-Id: Ia37fa5f8021346a4cbeedd2f404e88476d9e7bd3 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | / build on iOS: enable Carbon code only for OS XRichard Moe Gustavsen2013-08-132-17/+15
|/ / | | | | | | | | Change-Id: I462bab74999c6a36b638eb3940d25c45d9620d73 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | QQuickStyleItem: add RTL supportJ-P Nurmi2013-08-051-0/+2
| | | | | | | | | | Change-Id: I5c23c555336e71ffc8267263c3d2171fa35c4efb Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | TabBar: enable LayoutMirroring aka RTL supportJ-P Nurmi2013-08-011-0/+1
| | | | | | | | | | Change-Id: I25885c8883dcc495dc9f97c7c2ad8074f51fa85e Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-233-7/+13
|\| | | | | | | Change-Id: I2f557f40e078a91d81e1a4683bf5d3d4a5dc95e8
| * ToolBar: Improved aestetics for Fusion styleJens Bache-Wiig2013-07-121-1/+4
| | | | | | | | | | | | | | | | We were drawing an ugly double gray line and had uneven spacing between tool buttons and margins. Change-Id: Ifd2a30cb2ae8f3fb31b5df8410e17cfbd1175978 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Allow mouse events when transient scroll bars are hiddenJens Bache-Wiig2013-07-122-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On mac, while transient scroll bars are not visible it was not possible to interact with the viewport as the mouse events were consumed by the scroll view. This makes the ScrollBar mouse area disabled before a scroll is triggered. Note that I also added a minor workaround to ensure that we update the mouse cursor. Task-number: QTBUG-32400 Change-Id: If091edf054fcab65feb9b8c8e5c45e25431f4be4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-1/+0
|\| | | | | | | Change-Id: I05931c5fbcd0ce61e09803239f97713f910588cc
| * Include qquickstyleitem_p.h only if QT_NO_WIDGETS not definedCaroline Chao2013-06-271-1/+0
| | | | | | | | | | Change-Id: I7c2045acbd2331ec4ab7b14cf7694332f0b6a49b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-247-43/+109
|\| | | | | | | Change-Id: Ie546536fe3a506758b552d66ef88b7f59683df90
| * Fix ScrollViewHelper warnings when using the Base styleJ-P Nurmi2013-06-241-2/+2
| | | | | | | | | | | | | | | | ScrollViewHelper.qml:124/164: Unable to assign [undefined] to bool Change-Id: Ib41244397d830884c08dbc7b12e0000b62350f61 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Add private.priCaroline Chao2013-06-242-25/+26
| | | | | | | | | | | | | | | | To gather all the source and header files specific to the QtQuick.Controls.Private module. Change-Id: I5bc0f4d4efc570fa375ecd178b3ca289c54398e9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Move the static register functions into QQuickControlsPrivateCaroline Chao2013-06-243-17/+76
| | | | | | | | | | | | | | | | And create a separate header file, qquickcontrolsprivate_p.h Change-Id: Ibb4ec834709b6240fb19379a67e3948426d0f4ec Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Remove the QtQuick.Controls.Styles.Private moduleCaroline Chao2013-06-241-0/+5
| | | | | | | | | | | | | | | | | | | | This module doesn't bring much value by itself. Move the private styles to the QtQuick.Controls.Private module instead. Change-Id: I2f633b4334b5a6120a3c402e9e30b294811f048d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Make the JS files available via the private moduleCaroline Chao2013-06-242-1/+2
| | | | | | | | | | | | | | | | Instead of importing them using relative path. Change-Id: Ibe2e23f3bafc522e2848d9d00d244d026eacd168 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-205-4/+31
|\| | | | | | | Change-Id: Ic7ea23c491b1938f33a30be6e4e5febd8ae7c380
| * Make import of QtQuick.Controls.Private consistentCaroline Chao2013-06-201-0/+1
| | | | | | | | | | | | | | | | Import QtQuick.Controls when QtQuick.Controls.Private is imported. Change-Id: I2c962b7310a74e0905e8cec08ee6563a5d98e9d7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * SpinBox: omit group separatorsJ-P Nurmi2013-06-191-0/+4
| | | | | | | | | | | | Task-number: QTBUG-31839 Change-Id: I90879cbc116f399f07e2ae53e998253f2e81a5e2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Mac: respect scrollbar style changesJ-P Nurmi2013-06-183-4/+26
| | | | | | | | | | | | Task-number: QTBUG-31537 Change-Id: I670730934a48655f65df4f2be44e6ce8fa6bbdf7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-2/+0
|\| | | | | | | Change-Id: I1efe2710f34ec83077abf69e0220f299605c71e0
| * Don't let tabs grab focus on pressJens Bache-Wiig2013-06-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Tab buttons should never take focus when pressed, but only pass on focus to their child items. Tab focus should only get focus when they are tabbed into. Autotest is updated. Change-Id: I0edad4d893be7ed7066d3a3631ca340e9bf8cb53 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵J-P Nurmi2013-06-0714-101/+200
|\| | | | | | | refs/staging/dev
| * Expose hovered to our controls and document it consistentlyJens Bache-Wiig2013-06-062-13/+16
| | | | | | | | | | | | | | | | | | The current solution is messy and we only expose it partially to some of our styles. I think we should simply expose this to all. Change-Id: Ia546d5657ea416df99c9d9d92cc714b7f1c928fe Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
| * Buttons: Allow overriding of visual properties when 'action' is setGabriel de Dietrich2013-06-032-7/+44
| | | | | | | | | | | | | | | | | | | | Those properties are, text, tooltip, iconName, and iconSource. Also, properly capitalized gallery's tooltips. Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * TabViewStyle: expose styleData.availableWidthJ-P Nurmi2013-05-311-1/+1
| | | | | | | | | | Change-Id: Ib209ec7311c64f172718c8baa7d7f63f6f79a3a8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix missing margins and incorrect size for ToolBar and StatusBarJens Bache-Wiig2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | Using the implicitHeight of an item makes ToolBar and StatusBar a lot more useable with layouts. In addition we enable the padding property from the style, allowing its content to be positioned in a more convenient way. This is similar to how we already do it for GroupBox. Change-Id: Ia2aa1bcb9ae109718fd752401400222adec242ac Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Make styleHints a variant mapJens Bache-Wiig2013-05-303-51/+55
| | | | | | | | | | | | | | | | | | | | The styleHints are not really flexible enough as a stringlist as we want to be able to pass actual properties. Since we already have a properties member of the style we should move all of our internal properties to that. Change-Id: Id7a66ade243461f54c41b9ec89144668aaf19483 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Rename PaddedStyle to AbstractStyleJ-P Nurmi2013-05-305-26/+68
| | | | | | | | | | | | | | | | | | | | | | Make Style inherit AbstractStyle, so it becomes the base class of all styles. AbstractStyle also now has a default "data" property so it's possible to conveniently declare helper content inside styles. Change-Id: Id84f3762cfae506e65021322619d7fb77b137994 Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Rename::tabAt(index) to getTab(index)J-P Nurmi2013-05-291-1/+1
| | | | | | | | | | | | | | The fooAt() type methods are reserved for coordinate based queries. Change-Id: Iea91bdd29df4fa53cc1c7a07880f466ef2325725 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Improved size calculation of GroupBoxJens Bache-Wiig2013-05-292-0/+14
| | | | | | | | | | | | | | | | This adds some pixel tweaks on mac, adds minimum size to fit the label and fixes dpi scaling on Windows Change-Id: I4c43ba4a7815be87356336a9dafc1a217437940b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Consistent use of "hovered" and style API conventionsJens Bache-Wiig2013-05-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | We were still using "containsMouse" in a few places, and we should consistently add "hovered" to all button types for consistency. Also fixed the SplitView to follow the new style conventions. Change-Id: Iebc333c0cecc5bcde27e626b1a611c2f2edcf7dc Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | TabView: Added tabBar background handling.Tomasz Olszak2013-06-061-1/+17
|/ | | | | | | | | Additionally added possibility of flicking tabBar. If content of TabBar is flickable then tab should be changed on click not press. Change-Id: I8b9d75004e0a7456831cd98e46987da2d432b7bd Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* TabViewStyle: rename 'tab' grouped property to 'styleData'J-P Nurmi2013-05-271-1/+1
| | | | | Change-Id: If56b5ca4af119d7897425609dcaf04336f77e032 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename controlState to styleDataJ-P Nurmi2013-05-272-3/+3
| | | | | Change-Id: I06c9f4b0d9b6eef7d2ca608827eee982d8d97027 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ScrollView: take Flickable::originX and originY into accountJ-P Nurmi2013-05-271-4/+8
| | | | | Change-Id: I16eb186a2b1f706bbc961d34a614bf2f9a9a0646 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Yet another plugin renameJens Bache-Wiig2013-05-272-2/+2
| | | | | | | | | For consistency we should use "plugin" as suffix on plugin names. Change-Id: Ieea483cc1d7642e4fcd7d0907de8efd7e00743e1 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix item view selection colorJens Bache-Wiig2013-05-271-4/+7
| | | | | | | | We need to update the active palette text color every time the state changes. Change-Id: I7861eb4be76ccaeb58e9ff9aea58fa54d4f8d4c9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename generic plugin namesJens Bache-Wiig2013-05-272-2/+2
| | | | | | | | | We should not use names as generic as "plugin.dll" and "private.dll". This will cause a lot of confusion when deploying. Task-number: QTBUG-31348 Change-Id: Iee18e4d0cd713b63ff1b99dc0db31123b90666ec Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Pixel adjustment on macJens Bache-Wiig2013-05-271-2/+2
| | | | | | | | | Made the SpinBox and TextField 22 px on mac. Fixed internal offset. Change-Id: I36964048415dfedb3db0fac65fb8c1b710ea226f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Pass selected tab rect to styleJens Bache-Wiig2013-05-272-1/+12
| | | | | | | | | | | | In particular QGtkStyle depends on having the selected tab rect in the style option. Otherwise it cannot draw the tab frame correctly as we pass this information on to gtk. In addition we were not correctly setting the tab position on the frame. Change-Id: I9aa17d6b33f6b283122014994dc92a6afb913f30 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Improve size hints for SpinBox and TextFieldJens Bache-Wiig2013-05-271-12/+13
| | | | | | | | | These were both too small on most platforms. Since we have rather broken logic in widgets for this, I will simply assume they share the same height. Change-Id: I98da5a925087fec300de3c1c91b58110103e1a38 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add missing focus rect to check box and radio buttonJens Bache-Wiig2013-05-242-0/+13
| | | | | | | | | | | | Only mac style actually indicated focus as we depend on a focus rect around the text label for other styles. Bonus fix: When setting the width of the check box we would still use the implicit width in the style which meant that items would overlap incorrectly Change-Id: Ibb4dc92633fbc5fb200a35d1c0b04a297c7f8f42 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix tab overlap on Windows XP and Windows VistaJens Bache-Wiig2013-05-241-1/+1
| | | | | | | | | In Windows XP style, we actually use different values based on tab position. That means we have to pass these values through the tab style option. Change-Id: I65904a9a57326003cfddef1a12ada5dda2fa2eab Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Enable padding as a grouped propertyJens Bache-Wiig2013-05-247-64/+246
| | | | | | | | | We want padding to be a grouped property as the existing Margins property looks rather odd and insconsistent. Change-Id: I9e614f9161aaf01af200b19a1fb46a51beec6fb4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-18 10:37:31 +0000