UI: Update Qt 5.12

This commit is contained in:
Nodir Temirkhodjaev 2018-04-12 19:00:13 +05:00
parent aa887c5a61
commit 16a83de3be
11 changed files with 22 additions and 22 deletions

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.Button {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
contentItem.implicitHeight + topPadding + bottomPadding)
padding: 6

View File

@ -42,9 +42,9 @@ import QtQuick.Controls.impl 2.5
T.CheckDelegate {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.ItemDelegate {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Controls.impl 2.5
T.MenuBarItem {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.MenuItem {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.RadioDelegate {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.RoundButton {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
contentItem.implicitHeight + topPadding + bottomPadding)
padding: 6

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.SwipeDelegate {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Controls.impl 2.5
T.SwitchDelegate {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.TabButton {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
contentItem.implicitHeight + topPadding + bottomPadding)
padding: 6

View File

@ -42,9 +42,9 @@ import QtQuick.Templates 2.5 as T
T.ToolButton {
id: control
implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitWidth: Math.max(implicitBackgroundWidth,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight,
contentItem.implicitHeight + topPadding + bottomPadding)
padding: 6