Skip to content

Commit

Permalink
[ui] Revamp the svg/raster marker size widgets placement
Browse files Browse the repository at this point in the history 
Benefits are:
- data-defined width and height properties button closer to
  width and height spinboxes
- minimum horizontal width reduced
  • Loading branch information
@nirvn
nirvn committed May 17, 2019
1 parent 6ca1b30 commit 92ea2a5
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 40 deletions.
43 changes: 23 additions & 20 deletions src/ui/symbollayer/widget_rastermarker.ui
View file
Expand Up @@ -160,7 +160,7 @@
</item>
</layout>
</item>
<item row="3" column="1">
<item row="3" column="1" colspan="2">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="2" rowspan="2">
<layout class="QHBoxLayout" name="_2">
Expand Down Expand Up @@ -194,6 +194,20 @@
</item>
</layout>
</item>
<item row="0" column="3">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QgsPropertyOverrideButton" name="mHeightDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
Expand Down Expand Up @@ -258,7 +272,14 @@
</property>
</widget>
</item>
<item row="0" column="3" rowspan="2">
<item row="2" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Unit</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QgsUnitSelectionWidget" name="mSizeUnitWidget" native="true">
<property name="minimumSize">
<size>
Expand Down Expand Up @@ -358,24 +379,6 @@
</property>
</widget>
</item>
<item row="3" column="2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mHeightDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="10" column="1">
<widget class="QComboBox" name="mVerticalAnchorComboBox">
<item>
Expand Down
43 changes: 23 additions & 20 deletions src/ui/symbollayer/widget_svgmarker.ui
View file
Expand Up @@ -130,24 +130,6 @@
</property>
</widget>
</item>
<item row="0" column="3">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mHeightDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="1">
<widget class="QgsColorButton" name="mChangeStrokeColorButton">
<property name="sizePolicy">
Expand Down Expand Up @@ -414,7 +396,7 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="1" colspan="3">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_10">
Expand All @@ -423,6 +405,20 @@
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QgsPropertyOverrideButton" name="mHeightDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsDoubleSpinBox" name="spinWidth">
<property name="sizePolicy">
Expand Down Expand Up @@ -512,7 +508,14 @@
</item>
</layout>
</item>
<item row="0" column="3" rowspan="2">
<item row="2" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Unit</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QgsUnitSelectionWidget" name="mSizeUnitWidget" native="true">
<property name="minimumSize">
<size>
Expand Down

0 comments on commit 92ea2a5

Please sign in to comment.