Make digitizing toolbar icons look splendy on all DPI screens

opengisch · Sep 30, 2024 · 58d3c26 · 58d3c26
1 parent 7656b3e
commit 58d3c26
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 14 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -60,16 +60,8 @@
         <file>themes/qfield/xxxhdpi/ic_create_white_24dp.png</file>
         <file>themes/qfield/nodpi/ic_clear_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_add_white_24dp.svg</file>
-        <file>themes/qfield/hdpi/ic_add_vertex_white_24dp.png</file>
-        <file>themes/qfield/mdpi/ic_add_vertex_white_24dp.png</file>
-        <file>themes/qfield/xhdpi/ic_add_vertex_white_24dp.png</file>
-        <file>themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png</file>
-        <file>themes/qfield/xxxhdpi/ic_add_vertex_white_24dp.png</file>
-        <file>themes/qfield/hdpi/ic_remove_vertex_white_24dp.png</file>
-        <file>themes/qfield/mdpi/ic_remove_vertex_white_24dp.png</file>
-        <file>themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png</file>
-        <file>themes/qfield/xxhdpi/ic_remove_vertex_white_24dp.png</file>
-        <file>themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png</file>
+        <file>themes/qfield/nodpi/ic_add_vertex_white_24dp.svg</file>
+        <file>themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_menu_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_move_white_24dp.svg</file>
         <file>themes/qfield/nodpi/ic_location_white_24dp.svg</file>

diff --git a/images/themes/qfield/hdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/hdpi/ic_add_vertex_white_24dp.png
diff --git a/images/themes/qfield/hdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/hdpi/ic_remove_vertex_white_24dp.png
diff --git a/images/themes/qfield/mdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/mdpi/ic_add_vertex_white_24dp.png
diff --git a/images/themes/qfield/mdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/mdpi/ic_remove_vertex_white_24dp.png
diff --git a/images/themes/qfield/nodpi/ic_add_vertex_white_24dp.svg b/images/themes/qfield/nodpi/ic_add_vertex_white_24dp.svg
diff --git a/images/themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg b/images/themes/qfield/nodpi/ic_remove_vertex_white_24dp.svg
diff --git a/images/themes/qfield/xhdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/xhdpi/ic_add_vertex_white_24dp.png
diff --git a/images/themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/xhdpi/ic_remove_vertex_white_24dp.png
diff --git a/images/themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/xxhdpi/ic_add_vertex_white_24dp.png
diff --git a/images/themes/qfield/xxhdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/xxhdpi/ic_remove_vertex_white_24dp.png
diff --git a/images/themes/qfield/xxxhdpi/ic_add_vertex_white_24dp.png b/images/themes/qfield/xxxhdpi/ic_add_vertex_white_24dp.png
diff --git a/images/themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png b/images/themes/qfield/xxxhdpi/ic_remove_vertex_white_24dp.png
diff --git a/src/qml/DigitizingToolbar.qml b/src/qml/DigitizingToolbar.qml
@@ -129,7 +129,7 @@ QfVisibilityFadingRow {
 
   QfToolButton {
     id: removeVertexButton
-    iconSource: Theme.getThemeIcon("ic_remove_vertex_white_24dp")
+    iconSource: Theme.getThemeVectorIcon("ic_remove_vertex_white_24dp")
     visible: rubberbandModel && rubberbandModel.vertexCount > 1
     round: true
     bgcolor: Theme.darkGray
@@ -162,7 +162,7 @@ QfVisibilityFadingRow {
         Theme.darkGray;
       }
     }
-    iconSource: Theme.getThemeIcon("ic_add_vertex_white_24dp")
+    iconSource: Theme.getThemeVectorIcon("ic_add_vertex_white_24dp")
     iconColor: enabled ? "white" : Theme.darkGraySemiOpaque
 
     property bool lastAdditionAveraged: false

diff --git a/src/qml/OverlayFeatureFormDrawer.qml b/src/qml/OverlayFeatureFormDrawer.qml
@@ -69,8 +69,7 @@ Drawer {
 
   FeatureForm {
     id: overlayFeatureForm
-    height: parent.height
-    width: parent.width
+    anchors.fill: parent
     visible: true
 
     topMargin: overlayFeatureFormDrawer.y == 0 ? mainWindow.sceneTopMargin : 0.0