Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4b215098
Commit
4b215098
authored
Jul 30, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace old QGCComboBox with a standard, QtQuick 2.x one.
parent
0271c2cc
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
252 deletions
+45
-252
SimpleItemEditor.qml
src/PlanView/SimpleItemEditor.qml
+1
-1
PageView.qml
src/QmlControls/PageView.qml
+1
-1
QGCComboBox.qml
src/QmlControls/QGCComboBox.qml
+41
-249
ScreenTools.qml
src/QmlControls/ScreenTools.qml
+2
-1
No files found.
src/PlanView/SimpleItemEditor.qml
View file @
4b215098
...
...
@@ -92,7 +92,7 @@ Rectangle {
indexModel
:
false
model
:
object
.
enumStrings
fact
:
object
pointSize
:
ScreenTools
.
smallFontPointSize
font.pointSize
:
ScreenTools
.
smallFontPointSize
Layout.column
:
1
Layout.row
:
index
Layout.fillWidth
:
true
...
...
src/QmlControls/PageView.qml
View file @
4b215098
...
...
@@ -27,7 +27,7 @@ Rectangle {
model
:
_instrumentPages
textRole
:
"
title
"
centeredLabel
:
true
pointSize
:
ScreenTools
.
smallFontPointSize
font.pointSize
:
ScreenTools
.
smallFontPointSize
Image
{
anchors.leftMargin
:
_margins
...
...
src/QmlControls/QGCComboBox.qml
View file @
4b215098
This diff is collapsed.
Click to expand it.
src/QmlControls/ScreenTools.qml
View file @
4b215098
...
...
@@ -75,7 +75,7 @@ Item {
property
bool
isDebug
:
ScreenToolsController
.
isDebug
property
bool
isMac
:
ScreenToolsController
.
isMacOS
property
bool
isTinyScreen
:
(
Screen
.
width
/
realPixelDensity
)
<
120
// 120mm
property
bool
isShortScreen
:
ScreenToolsController
.
isMobile
&&
((
Screen
.
height
/
Screen
.
width
)
<
0.6
)
// Nexus 7 for example
property
bool
isShortScreen
:
((
Screen
.
height
/
realPixelDensity
)
<
120
)
||
(
ScreenToolsController
.
isMobile
&&
((
Screen
.
height
/
Screen
.
width
)
<
0.6
))
property
bool
isHugeScreen
:
(
Screen
.
width
/
realPixelDensity
)
>=
(
23.5
*
25.4
)
// 27" monitor
property
bool
isSerialAvailable
:
ScreenToolsController
.
isSerialAvailable
...
...
@@ -90,6 +90,7 @@ Item {
property
real
implicitTextFieldHeight
:
Math
.
round
(
defaultFontPixelHeight
*
(
isMobile
?
2.0
:
1.6
))
property
real
implicitComboBoxHeight
:
Math
.
round
(
defaultFontPixelHeight
*
(
isMobile
?
2.0
:
1.6
))
property
real
implicitComboBoxWidth
:
Math
.
round
(
defaultFontPixelWidth
*
(
isMobile
?
7.0
:
5.0
))
property
real
comboBoxPadding
:
Math
.
round
(
defaultFontPixelWidth
*
(
isShortScreen
?
1
:
0.5
))
property
real
implicitSliderHeight
:
isMobile
?
Math
.
max
(
defaultFontPixelHeight
,
minTouchPixels
)
:
defaultFontPixelHeight
// It's not possible to centralize an even number of pixels, checkBoxIndicatorSize should be an odd number to allow centralization
property
real
checkBoxIndicatorSize
:
2
*
Math
.
floor
(
defaultFontPixelHeight
*
(
isMobile
?
1.5
:
1.0
)
/
2
)
+
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment