Skip to content

Commit 92ddf10

Browse files
authored
Merge pull request #549 from OpenHD/2.3-evo-consti-dev
Fix small layouting issue on some android screens
2 parents a70b1aa + 6cf60b9 commit 92ddf10

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/build_test_android_32.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
8989
run: |
9090
qmake ${SOURCE_DIR}/QOpenHD.pro ANDROID_ABIS="armeabi-v7a" -spec android-clang CONFIG+=debug CONFIG+=qml_debug
91-
make -j$(($(nproc)/2))
91+
make -j$(($(nproc)/2)) qmake_all
9292
zip -r file.zip .
9393
9494
- name: ccache post-run

qml/ui/configpopup/ConfigPopup.qml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Rectangle {
1212
id: settings_form
1313

1414
property int eeInt : 0
15+
// size of the elements in the left bar - e.g. what allows switching between all the tabs
16+
property int left_sidebar_elements_height: 46
1517

1618
function openSettings() {
1719
visible = true
@@ -108,7 +110,7 @@ Rectangle {
108110

109111
// QOpenHD Settings - AppSettingsPanel
110112
Item {
111-
height: 48
113+
height: left_sidebar_elements_height
112114
width: parent.width
113115

114116
Button{
@@ -156,7 +158,7 @@ Rectangle {
156158

157159
// OpenHD Settings - MavlinkAllSettingsPanel
158160
Item {
159-
height: 48
161+
height: left_sidebar_elements_height
160162
width: parent.width
161163
Button{
162164
id: openhdSettingsBtn
@@ -203,7 +205,7 @@ Rectangle {
203205

204206
// Log
205207
Item {
206-
height: 48
208+
height: left_sidebar_elements_height
207209
width: parent.width
208210
visible: true
209211
Button{
@@ -252,7 +254,7 @@ Rectangle {
252254

253255
// Power
254256
Item {
255-
height: 48
257+
height: left_sidebar_elements_height
256258
width: parent.width
257259
Button{
258260
id: powerSettingsBtn
@@ -300,7 +302,7 @@ Rectangle {
300302

301303
// About
302304
Item {
303-
height: 48
305+
height: left_sidebar_elements_height
304306
width: parent.width
305307
Button{
306308
id: aboutBtn
@@ -355,7 +357,7 @@ Rectangle {
355357

356358
// RC
357359
Item {
358-
height: 48
360+
height: left_sidebar_elements_height
359361
width: parent.width
360362
Button{
361363
id: rcSettingsBtn
@@ -404,7 +406,7 @@ Rectangle {
404406

405407
// Developer stats
406408
Item {
407-
height: 48
409+
height: left_sidebar_elements_height
408410
width: parent.width
409411
Button{
410412
id: devStatsBtn
@@ -452,7 +454,7 @@ Rectangle {
452454

453455
// connect (on android)
454456
Item {
455-
height: 48
457+
height: left_sidebar_elements_height
456458
width: parent.width
457459
// only show on android to not confuse users
458460
visible: _qopenhd.is_android()
@@ -503,7 +505,7 @@ Rectangle {
503505
Item {
504506
id: eeItem
505507
visible: false
506-
height: 48
508+
height: left_sidebar_elements_height
507509
width: parent.width
508510
Button{
509511
id: eeBtn

0 commit comments

Comments
 (0)