Skip to content

Commit de437ab

Browse files
committed
Set options list style to to white background
1 parent 53197ad commit de437ab

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

src/core/raster/qgsrasterlayer.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,15 +2279,12 @@ bool QgsRasterLayer::readSymbology( const QDomNode& layer_node, QString& errorMe
22792279

22802280
if ( !rasterRendererElem.isNull() )
22812281
{
2282-
if ( !rasterRendererElem.isNull() )
2282+
QString rendererType = rasterRendererElem.attribute( "type" );
2283+
QgsRasterRendererRegistryEntry rendererEntry;
2284+
if ( QgsRasterRendererRegistry::instance()->rendererData( rendererType, rendererEntry ) )
22832285
{
2284-
QString rendererType = rasterRendererElem.attribute( "type" );
2285-
QgsRasterRendererRegistryEntry rendererEntry;
2286-
if ( QgsRasterRendererRegistry::instance()->rendererData( rendererType, rendererEntry ) )
2287-
{
2288-
QgsRasterRenderer *renderer = rendererEntry.rendererCreateFunction( rasterRendererElem, dataProvider() );
2289-
mPipe.set( renderer );
2290-
}
2286+
QgsRasterRenderer *renderer = rendererEntry.rendererCreateFunction( rasterRendererElem, dataProvider() );
2287+
mPipe.set( renderer );
22912288
}
22922289
}
22932290

src/ui/qgsoptionsbase.ui

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
<height>16777215</height>
6060
</size>
6161
</property>
62+
<property name="styleSheet">
63+
<string notr="true">background-color: #fff</string>
64+
</property>
6265
<property name="horizontalScrollBarPolicy">
6366
<enum>Qt::ScrollBarAlwaysOff</enum>
6467
</property>
@@ -266,8 +269,8 @@
266269
<rect>
267270
<x>0</x>
268271
<y>0</y>
269-
<width>654</width>
270-
<height>529</height>
272+
<width>663</width>
273+
<height>562</height>
271274
</rect>
272275
</property>
273276
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -772,8 +775,8 @@
772775
<rect>
773776
<x>0</x>
774777
<y>0</y>
775-
<width>611</width>
776-
<height>808</height>
778+
<width>652</width>
779+
<height>803</height>
777780
</rect>
778781
</property>
779782
<layout class="QVBoxLayout" name="verticalLayout_22">
@@ -1102,8 +1105,8 @@
11021105
<rect>
11031106
<x>0</x>
11041107
<y>0</y>
1105-
<width>559</width>
1106-
<height>417</height>
1108+
<width>529</width>
1109+
<height>443</height>
11071110
</rect>
11081111
</property>
11091112
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -1421,8 +1424,8 @@
14211424
<rect>
14221425
<x>0</x>
14231426
<y>0</y>
1424-
<width>615</width>
1425-
<height>681</height>
1427+
<width>608</width>
1428+
<height>728</height>
14261429
</rect>
14271430
</property>
14281431
<layout class="QVBoxLayout" name="verticalLayout_29">
@@ -1909,8 +1912,8 @@
19091912
<rect>
19101913
<x>0</x>
19111914
<y>0</y>
1912-
<width>498</width>
1913-
<height>332</height>
1915+
<width>483</width>
1916+
<height>364</height>
19141917
</rect>
19151918
</property>
19161919
<layout class="QVBoxLayout" name="verticalLayout_25">
@@ -2148,8 +2151,8 @@
21482151
<rect>
21492152
<x>0</x>
21502153
<y>0</y>
2151-
<width>556</width>
2152-
<height>718</height>
2154+
<width>534</width>
2155+
<height>771</height>
21532156
</rect>
21542157
</property>
21552158
<layout class="QVBoxLayout" name="verticalLayout_30">
@@ -2528,8 +2531,8 @@
25282531
<rect>
25292532
<x>0</x>
25302533
<y>0</y>
2531-
<width>517</width>
2532-
<height>643</height>
2534+
<width>500</width>
2535+
<height>691</height>
25332536
</rect>
25342537
</property>
25352538
<layout class="QVBoxLayout" name="verticalLayout_31">
@@ -3017,8 +3020,8 @@
30173020
<rect>
30183021
<x>0</x>
30193022
<y>0</y>
3020-
<width>537</width>
3021-
<height>361</height>
3023+
<width>462</width>
3024+
<height>386</height>
30223025
</rect>
30233026
</property>
30243027
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -3157,8 +3160,8 @@
31573160
<rect>
31583161
<x>0</x>
31593162
<y>0</y>
3160-
<width>614</width>
3161-
<height>393</height>
3163+
<width>638</width>
3164+
<height>422</height>
31623165
</rect>
31633166
</property>
31643167
<layout class="QGridLayout" name="gridLayout_15">
@@ -3338,8 +3341,8 @@
33383341
<rect>
33393342
<x>0</x>
33403343
<y>0</y>
3341-
<width>300</width>
3342-
<height>248</height>
3344+
<width>298</width>
3345+
<height>240</height>
33433346
</rect>
33443347
</property>
33453348
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -3438,8 +3441,8 @@
34383441
<rect>
34393442
<x>0</x>
34403443
<y>0</y>
3441-
<width>521</width>
3442-
<height>650</height>
3444+
<width>540</width>
3445+
<height>672</height>
34433446
</rect>
34443447
</property>
34453448
<layout class="QVBoxLayout" name="verticalLayout_33">

0 commit comments

Comments
 (0)