Skip to content

Commit 52b5ef5

Browse files
author
wonder
committed
Fixed simple symbol marker sizes in the symbol layer widget
git-svn-id: http://svn.osgeo.org/qgis/trunk@13323 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8c7a31d commit 52b5ef5

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/gui/symbology-ng/qgssymbollayerv2widget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( QWidget*
156156
QStringList names;
157157
names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle"
158158
<< "equilateral_triangle" << "star" << "regular_star" << "arrow" << "line";
159-
double markerSize = size.width() - 1; // keep some space around
159+
double markerSize = DEFAULT_POINT_SIZE * 2;
160160
for ( int i = 0; i < names.count(); ++i )
161161
{
162162
QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( names[i], QColor( 200, 200, 200 ), QColor( 0, 0, 0 ), markerSize );
163-
QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size ); //todo: unit needs to be a parameter
163+
QIcon icon = QgsSymbolLayerV2Utils::symbolLayerPreviewIcon( lyr, QgsSymbolV2::MM, size );
164164
QListWidgetItem* item = new QListWidgetItem( icon, QString(), lstNames );
165165
item->setData( Qt::UserRole, names[i] );
166166
delete lyr;

src/ui/symbollayer/widget_simplemarker.ui

-3
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@
168168
<property name="viewMode">
169169
<enum>QListView::IconMode</enum>
170170
</property>
171-
<property name="uniformItemSizes">
172-
<bool>true</bool>
173-
</property>
174171
<property name="wordWrap">
175172
<bool>true</bool>
176173
</property>

0 commit comments

Comments
 (0)