Skip to content

Commit c7f1476

Browse files
nirvnnirvn
committed
Insure menu item height is consistent across the board
1 parent 995dd62 commit c7f1476

File tree

3 files changed

+31
-17
lines changed

3 files changed

+31
-17
lines changed

‎src/qml/NavigationBar.qml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ Rectangle {
545545
MenuItem {
546546
id: mergeSelectedFeaturesBtn
547547
text: qsTr('Merge Selected Features')
548+
height: 48
548549
icon.source: Theme.getThemeVectorIcon("ic_merge_features_white_24dp")
549550
enabled: toolBar.model && toolBar.model.canMergeSelection && toolBar.model.selectedCount > 1 && projectInfo.editRights
550551

@@ -557,6 +558,7 @@ Rectangle {
557558
MenuItem {
558559
id: moveSelectedFeaturesBtn
559560
text: qsTr('Move Selected Feature(s)')
561+
height: 48
560562
icon.source: Theme.getThemeVectorIcon("ic_move_white_24dp")
561563
enabled: toolBar.model && toolBar.model.canMoveSelection && projectInfo.editRights
562564

@@ -569,6 +571,7 @@ Rectangle {
569571
MenuItem {
570572
id: duplicateSelectedFeaturesBtn
571573
text: qsTr('Duplicate Selected Feature(s)')
574+
height: 48
572575
icon.source: Theme.getThemeVectorIcon("ic_duplicate_black_24dp")
573576
enabled: toolBar.model && toolBar.model.canDuplicateSelection && projectInfo.insertRights
574577

@@ -584,7 +587,7 @@ Rectangle {
584587
icon.source: Theme.getThemeVectorIcon("ic_delete_forever_white_24dp")
585588
enabled: toolBar.model && toolBar.model.canDeleteSelection && projectInfo.editRights
586589
visible: enabled
587-
height: enabled ? undefined : 0
590+
height: enabled ? 48 : 0
588591

589592
font: Theme.defaultFont
590593
leftPadding: Theme.menuItemLeftPadding
@@ -599,6 +602,7 @@ Rectangle {
599602
MenuItem {
600603
id: processingSelectedFeaturesBtn
601604
text: qsTr('Process Selected Feature(s)')
605+
height: 48
602606
icon.source: Theme.getThemeVectorIcon("ic_processing_black_24dp")
603607
enabled: toolBar.model && toolBar.model.canProcessSelection && projectInfo.editRights
604608

‎src/qml/QFieldLocalDataPickerScreen.qml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ Page {
418418

419419
font: Theme.defaultFont
420420
width: parent.width
421-
height: enabled ? undefined : 0
421+
height: enabled ? 48 : 0
422422
leftPadding: Theme.menuItemLeftPadding
423423

424424
text: qsTr("Send to...")
@@ -434,7 +434,7 @@ Page {
434434

435435
font: Theme.defaultFont
436436
width: parent.width
437-
height: enabled ? undefined : 0
437+
height: enabled ? 48 : 0
438438
leftPadding: Theme.menuItemLeftPadding
439439

440440
text: qsTr("Push to QFieldCloud")
@@ -452,7 +452,7 @@ Page {
452452

453453
font: Theme.defaultFont
454454
width: parent.width
455-
height: enabled ? undefined : 0
455+
height: enabled ? 48 : 0
456456
leftPadding: Theme.menuItemLeftPadding
457457

458458
text: qsTr("Export to folder...")
@@ -469,7 +469,7 @@ Page {
469469

470470
font: Theme.defaultFont
471471
width: parent.width
472-
height: enabled ? undefined : 0
472+
height: enabled ? 48 : 0
473473
leftPadding: Theme.menuItemLeftPadding
474474

475475
text: !itemMenu.itemIsFavorite ? qsTr("Add to favorites") : qsTr("Remove from favorites")
@@ -496,7 +496,7 @@ Page {
496496

497497
font: Theme.defaultFont
498498
width: parent.width
499-
height: enabled ? undefined : 0
499+
height: enabled ? 48 : 0
500500
leftPadding: Theme.menuItemLeftPadding
501501

502502
text: qsTr("Export to folder...")
@@ -512,7 +512,7 @@ Page {
512512

513513
font: Theme.defaultFont
514514
width: parent.width
515-
height: enabled ? undefined : 0
515+
height: enabled ? 48 : 0
516516
leftPadding: Theme.menuItemLeftPadding
517517

518518
text: qsTr("Send compressed folder to...")
@@ -528,7 +528,7 @@ Page {
528528

529529
font: Theme.defaultFont
530530
width: parent.width
531-
height: enabled ? undefined : 0
531+
height: enabled ? 48 : 0
532532
leftPadding: Theme.menuItemLeftPadding
533533

534534
text: qsTr("Upload folder to WebDAV server")
@@ -546,7 +546,7 @@ Page {
546546

547547
font: Theme.defaultFont
548548
width: parent.width
549-
height: enabled ? undefined : 0
549+
height: enabled ? 48 : 0
550550
leftPadding: Theme.menuItemLeftPadding
551551

552552
text: qsTr("Download folder from WebDAV server")
@@ -571,7 +571,7 @@ Page {
571571

572572
font: Theme.defaultFont
573573
width: parent.width
574-
height: enabled ? undefined : 0
574+
height: enabled ? 48 : 0
575575
leftPadding: Theme.menuItemLeftPadding
576576

577577
text: qsTr("Remove dataset")
@@ -588,7 +588,7 @@ Page {
588588

589589
font: Theme.defaultFont
590590
width: parent.width
591-
height: enabled ? undefined : 0
591+
height: enabled ? 48 : 0
592592
leftPadding: Theme.menuItemLeftPadding
593593

594594
text: qsTr("Remove folder")
@@ -625,7 +625,7 @@ Page {
625625
visible: enabled
626626
font: Theme.defaultFont
627627
width: parent.width
628-
height: enabled ? undefined : 0
628+
height: enabled ? 48 : 0
629629
leftPadding: Theme.menuItemLeftPadding
630630

631631
text: qsTr("Import project from folder")
@@ -641,7 +641,7 @@ Page {
641641
visible: enabled
642642
font: Theme.defaultFont
643643
width: parent.width
644-
height: enabled ? undefined : 0
644+
height: enabled ? 48 : 0
645645
leftPadding: Theme.menuItemLeftPadding
646646

647647
text: qsTr("Import project from ZIP")
@@ -657,7 +657,7 @@ Page {
657657
visible: enabled
658658
font: Theme.defaultFont
659659
width: parent.width
660-
height: enabled ? undefined : 0
660+
height: enabled ? 48 : 0
661661
leftPadding: Theme.menuItemLeftPadding
662662

663663
text: qsTr("Import dataset(s)")
@@ -678,6 +678,7 @@ Page {
678678

679679
font: Theme.defaultFont
680680
width: parent.width
681+
height: 48
681682
leftPadding: Theme.menuItemLeftPadding
682683

683684
text: qsTr("Import URL")
@@ -692,6 +693,7 @@ Page {
692693

693694
font: Theme.defaultFont
694695
width: parent.width
696+
height: 48
695697
leftPadding: Theme.menuItemLeftPadding
696698

697699
text: qsTr("Import WebDAV folder")
@@ -710,6 +712,7 @@ Page {
710712

711713
font: Theme.defaultFont
712714
width: parent.width
715+
height: 48
713716
leftPadding: Theme.menuItemLeftPadding
714717

715718
text: qsTr("Storage management help")
@@ -745,7 +748,7 @@ Page {
745748
visible: enabled
746749
font: Theme.defaultFont
747750
width: parent.width
748-
height: enabled ? undefined : 0
751+
height: enabled ? 48 : 0
749752
leftPadding: Theme.menuItemLeftPadding
750753

751754
text: qsTr("Update project from ZIP")
@@ -761,7 +764,7 @@ Page {
761764
visible: enabled
762765
font: Theme.defaultFont
763766
width: parent.width
764-
height: enabled ? undefined : 0
767+
height: enabled ? 48 : 0
765768
leftPadding: Theme.menuItemLeftPadding
766769

767770
text: qsTr("Upload project to WebDAV")
@@ -779,7 +782,7 @@ Page {
779782
visible: enabled
780783
font: Theme.defaultFont
781784
width: parent.width
782-
height: enabled ? undefined : 0
785+
height: enabled ? 48 : 0
783786
leftPadding: Theme.menuItemLeftPadding
784787

785788
text: qsTr("Download project from WebDAV")

‎src/qml/qgismobileapp.qml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2675,6 +2675,7 @@ ApplicationWindow {
26752675

26762676
font: Theme.defaultFont
26772677
leftPadding: Theme.menuItemLeftPadding
2678+
height: 48
26782679

26792680
onTriggered: {
26802681
if (SensorStatus == Qgis.DeviceConnectionStatus.Connected) {
@@ -2742,6 +2743,7 @@ ApplicationWindow {
27422743

27432744
font: Theme.defaultFont
27442745
leftPadding: Theme.menuItemLeftPadding
2746+
height: 48
27452747

27462748
onTriggered: {
27472749
highlighted = false;
@@ -2954,10 +2956,12 @@ ApplicationWindow {
29542956

29552957
MenuItem {
29562958
text: qsTr('Layer:') + ' ' + layerName
2959+
height: 48
29572960
enabled: false
29582961
}
29592962
MenuItem {
29602963
text: qsTr('Feature:') + ' ' + featureName
2964+
height: 48
29612965
enabled: false
29622966
}
29632967
MenuSeparator {
@@ -2969,6 +2973,7 @@ ApplicationWindow {
29692973
font: Theme.defaultFont
29702974
icon.source: Theme.getThemeVectorIcon("ic_baseline-list_white_24dp")
29712975
leftPadding: Theme.menuItemLeftPadding
2976+
height: 48
29722977

29732978
onTriggered: {
29742979
featureForm.model.setFeatures(menu.featureLayer, '$id = ' + menu.fid);
@@ -2982,6 +2987,7 @@ ApplicationWindow {
29822987
font: Theme.defaultFont
29832988
icon.source: Theme.getThemeVectorIcon("ic_copy_black_24dp")
29842989
leftPadding: Theme.menuItemLeftPadding
2990+
height: 48
29852991

29862992
onTriggered: {
29872993
clipboardManager.copyFeatureToClipboard(menu.featureLayer, menu.fid, true);
@@ -2994,6 +3000,7 @@ ApplicationWindow {
29943000
enabled: projectInfo.insertRights
29953001
icon.source: Theme.getThemeVectorIcon("ic_duplicate_black_24dp")
29963002
leftPadding: Theme.menuItemLeftPadding
3003+
height: 48
29973004

29983005
onTriggered: {
29993006
featureForm.model.setFeatures(menu.featureLayer, '$id = ' + menu.fid);

0 commit comments

Comments
 (0)