Skip to content

Commit 9029d7e

Browse files
olivierdalangolivierdalang
committedMay 15, 2019
better floater display (also for dark backgrounds)
·
ltr-3_40final-3_8_0
1 parent 04d7e2a commit 9029d7e

File tree

2 files changed

+93
-43
lines changed

2 files changed

+93
-43
lines changed
 

‎src/gui/qgsadvanceddigitizingfloater.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ QgsAdvancedDigitizingFloater::QgsAdvancedDigitizingFloater( QgsMapCanvas *canvas
2727
: QWidget( canvas->viewport() ), mMapCanvas( canvas ), mCadDockWidget( cadDockWidget )
2828
{
2929
setupUi( this );
30-
setWindowFlag( Qt::FramelessWindowHint );
30+
3131
setAttribute( Qt::WA_TransparentForMouseEvents );
32+
adjustSize();
3233

3334
setActive( QgsSettings().value( QStringLiteral( "/Cad/Floater" ), false ).toBool() );
3435

@@ -235,6 +236,7 @@ void QgsAdvancedDigitizingFloater::changeRelativeX( bool relative )
235236
{
236237
mXLabel->setText( "Δx" );
237238
}
239+
adjustSize();
238240
}
239241

240242
void QgsAdvancedDigitizingFloater::changeRelativeY( bool relative )
@@ -247,6 +249,7 @@ void QgsAdvancedDigitizingFloater::changeRelativeY( bool relative )
247249
{
248250
mYLabel->setText( "Δy" );
249251
}
252+
adjustSize();
250253
}
251254

252255
// distance is always relative
@@ -261,6 +264,7 @@ void QgsAdvancedDigitizingFloater::changeRelativeAngle( bool relative )
261264
{
262265
mAngleLabel->setText( "Δa" );
263266
}
267+
adjustSize();
264268
}
265269

266270
void QgsAdvancedDigitizingFloater::focusOnX()
@@ -304,22 +308,26 @@ void QgsAdvancedDigitizingFloater::enabledChangedX( bool enabled )
304308
{
305309
mXLineEdit->setVisible( enabled );
306310
mXLabel->setVisible( enabled );
311+
adjustSize();
307312
}
308313

309314
void QgsAdvancedDigitizingFloater::enabledChangedY( bool enabled )
310315
{
311316
mYLineEdit->setVisible( enabled );
312317
mYLabel->setVisible( enabled );
318+
adjustSize();
313319
}
314320

315321
void QgsAdvancedDigitizingFloater::enabledChangedDistance( bool enabled )
316322
{
317323
mDistanceLineEdit->setVisible( enabled );
318324
mDistanceLabel->setVisible( enabled );
325+
adjustSize();
319326
}
320327

321328
void QgsAdvancedDigitizingFloater::enabledChangedAngle( bool enabled )
322329
{
323330
mAngleLineEdit->setVisible( enabled );
324331
mAngleLabel->setVisible( enabled );
332+
adjustSize();
325333
}

‎src/ui/qgsadvanceddigitizingfloaterbase.ui

Lines changed: 84 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,56 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>150</width>
10-
<height>120</height>
9+
<width>279</width>
10+
<height>142</height>
1111
</rect>
1212
</property>
13+
<property name="palette">
14+
<palette>
15+
<active>
16+
<colorrole role="Base">
17+
<brush brushstyle="SolidPattern">
18+
<color alpha="127">
19+
<red>255</red>
20+
<green>255</green>
21+
<blue>255</blue>
22+
</color>
23+
</brush>
24+
</colorrole>
25+
</active>
26+
<inactive>
27+
<colorrole role="Base">
28+
<brush brushstyle="SolidPattern">
29+
<color alpha="127">
30+
<red>255</red>
31+
<green>255</green>
32+
<blue>255</blue>
33+
</color>
34+
</brush>
35+
</colorrole>
36+
</inactive>
37+
<disabled>
38+
<colorrole role="Base">
39+
<brush brushstyle="SolidPattern">
40+
<color alpha="255">
41+
<red>240</red>
42+
<green>240</green>
43+
<blue>240</blue>
44+
</color>
45+
</brush>
46+
</colorrole>
47+
</disabled>
48+
</palette>
49+
</property>
50+
<property name="autoFillBackground">
51+
<bool>true</bool>
52+
</property>
53+
<property name="styleSheet">
54+
<string notr="true">QLineEdit{background-color: rgba(255,255,255,127)}</string>
55+
</property>
1356
<layout class="QGridLayout" name="gridLayout">
1457
<property name="leftMargin">
15-
<number>0</number>
58+
<number>2</number>
1659
</property>
1760
<property name="topMargin">
1861
<number>0</number>
@@ -24,31 +67,38 @@
2467
<number>0</number>
2568
</property>
2669
<property name="horizontalSpacing">
27-
<number>6</number>
70+
<number>2</number>
2871
</property>
2972
<property name="verticalSpacing">
3073
<number>0</number>
3174
</property>
75+
<item row="2" column="1">
76+
<widget class="QLabel" name="mDistanceLabel">
77+
<property name="text">
78+
<string>d</string>
79+
</property>
80+
<property name="alignment">
81+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
82+
</property>
83+
</widget>
84+
</item>
3285
<item row="3" column="1">
3386
<widget class="QLabel" name="mAngleLabel">
3487
<property name="text">
35-
<string>Δa</string>
88+
<string>a</string>
89+
</property>
90+
<property name="alignment">
91+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
3692
</property>
3793
</widget>
3894
</item>
39-
<item row="2" column="3">
40-
<widget class="QLineEdit" name="mDistanceLineEdit">
41-
<property name="toolTip">
42-
<string/>
43-
</property>
95+
<item row="4" column="1">
96+
<widget class="QLabel" name="mXLabel">
4497
<property name="text">
45-
<string>-</string>
46-
</property>
47-
<property name="frame">
48-
<bool>false</bool>
98+
<string>x</string>
4999
</property>
50100
<property name="alignment">
51-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
101+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
52102
</property>
53103
</widget>
54104
</item>
@@ -71,6 +121,22 @@
71121
</property>
72122
</widget>
73123
</item>
124+
<item row="2" column="3">
125+
<widget class="QLineEdit" name="mDistanceLineEdit">
126+
<property name="toolTip">
127+
<string/>
128+
</property>
129+
<property name="text">
130+
<string>-</string>
131+
</property>
132+
<property name="frame">
133+
<bool>false</bool>
134+
</property>
135+
<property name="alignment">
136+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
137+
</property>
138+
</widget>
139+
</item>
74140
<item row="4" column="3">
75141
<widget class="QLineEdit" name="mXLineEdit">
76142
<property name="minimumSize">
@@ -90,18 +156,14 @@
90156
</property>
91157
</widget>
92158
</item>
93-
<item row="4" column="1">
94-
<widget class="QLabel" name="mXLabel">
95-
<property name="text">
96-
<string>x</string>
97-
</property>
98-
</widget>
99-
</item>
100159
<item row="5" column="1">
101160
<widget class="QLabel" name="mYLabel">
102161
<property name="text">
103162
<string>y</string>
104163
</property>
164+
<property name="alignment">
165+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
166+
</property>
105167
</widget>
106168
</item>
107169
<item row="5" column="3">
@@ -123,26 +185,6 @@
123185
</property>
124186
</widget>
125187
</item>
126-
<item row="2" column="1">
127-
<widget class="QLabel" name="mDistanceLabel">
128-
<property name="text">
129-
<string>d</string>
130-
</property>
131-
</widget>
132-
</item>
133-
<item row="6" column="3">
134-
<spacer name="verticalSpacer">
135-
<property name="orientation">
136-
<enum>Qt::Vertical</enum>
137-
</property>
138-
<property name="sizeHint" stdset="0">
139-
<size>
140-
<width>20</width>
141-
<height>40</height>
142-
</size>
143-
</property>
144-
</spacer>
145-
</item>
146188
</layout>
147189
</widget>
148190
<resources>

0 commit comments

Comments
 (0)
Please sign in to comment.