summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-10-21 16:11:30 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-10-21 21:12:58 (GMT)
commit4f64afc4b3409485821c597f5f702ff8fe205d8a (patch)
treefd355f97c56286b0b36712697f4bf35e952422c4
parent3e4849d5b48c35d789c14831995fcbcc3ff7976b (diff)
Harmonize place font sizes
(cherry picked from commit f527403b583bab8ea7a40b35c0b7bc77a049607b)
-rw-r--r--src/lib/marble/StyleBuilder.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index fb5e598..d4d9532 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -393,16 +393,18 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataPlacemark::Nation]
= GeoDataStyle::Ptr(new GeoDataStyle( QString(),
- QFont( defaultFamily, (int)(defaultSize * 1.2 ), 75, false ), QColor( "#404040" ) ));
+ QFont( defaultFamily, (int)(defaultSize * 1.5 ), 75, false ), QColor( "#404040" ) ));
// Align area labels centered
m_defaultStyle[GeoDataPlacemark::Nation]->labelStyle().setAlignment( GeoDataLabelStyle::Center );
- QFont osmCityFont = QFont(defaultFamily, (int)(defaultSize * 2.0 ), 75, false);
+ QFont osmCityFont = QFont(defaultFamily, (int)(defaultSize * 1.5 ), 75, false);
m_defaultStyle[GeoDataPlacemark::PlaceCity] = createOsmPOIStyle(osmCityFont, "place/place-6", QColor( "#202020" ));
m_defaultStyle[GeoDataPlacemark::PlaceCityCapital] = createOsmPOIStyle(osmCityFont, "place/place-capital-6", QColor( "#202020" ));
m_defaultStyle[GeoDataPlacemark::PlaceSuburb] = createOsmPOIStyle(osmCityFont, QString(), QColor( "#707070" ));
m_defaultStyle[GeoDataPlacemark::PlaceHamlet] = createOsmPOIStyle(osmCityFont, QString(), QColor( "#707070" ));
- m_defaultStyle[GeoDataPlacemark::PlaceLocality] = createOsmPOIStyle(osmCityFont, QString(), QColor( "#707070" ));
+ QFont localityFont = osmCityFont;
+ localityFont.setPointSize(defaultSize);
+ m_defaultStyle[GeoDataPlacemark::PlaceLocality] = createOsmPOIStyle(localityFont, QString(), QColor( "#707070" ));
m_defaultStyle[GeoDataPlacemark::PlaceTown] = createOsmPOIStyle(osmCityFont, "place/place-6", QColor( "#404040" ));
m_defaultStyle[GeoDataPlacemark::PlaceTownCapital] = createOsmPOIStyle(osmCityFont, "place/place-capital-6", QColor( "#404040" ));
m_defaultStyle[GeoDataPlacemark::PlaceVillage] = createOsmPOIStyle(osmCityFont, "place/place-6", QColor( "#505050" ));