Skip to content

Q
qgroundcontrol
Commit ff803dcb authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

parent 10fc35fb
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
src/PlanView/PlanEditToolbar.qml
View file @ ff803dcb
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 2.11 import QtQuick.Controls 2.4
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QGroundControl 1.0 import QGroundControl 1.0
......
src/QmlControls/QGCComboBox.qml
View file @ ff803dcb
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.11
import QtQuick.Window 2.11 import QtQuick.Window 2.3
import QtQuick.Controls 2.11 import QtQuick.Controls 2.4
import QtQuick.Controls.impl 2.11 import QtQuick.Controls.impl 2.4
import QtQuick.Templates 2.11 as T import QtQuick.Templates 2.4 as T
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
...@@ -20,12 +20,11 @@ T.ComboBox { ...@@ -20,12 +20,11 @@ T.ComboBox {
id: control id: control
padding: ScreenTools.comboBoxPadding padding: ScreenTools.comboBoxPadding
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, implicitWidth: Math.max(background ? background.implicitWidth : 0,
implicitContentWidth + leftPadding + rightPadding, contentItem.implicitWidth + leftPadding + rightPadding)
sizeToContents ? _popupWidth : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0,
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, Math.max(contentItem.implicitHeight,
implicitContentHeight + topPadding + bottomPadding, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
implicitIndicatorHeight + topPadding + bottomPadding)
leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width) rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment