summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-10-20 09:01:03 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-10-20 09:01:03 (GMT)
commitcc707b9afaed81038b5c378a54cca5e6b3ee9771 (patch)
tree547e97fdd4d021798fba8cf7ac3924feb550976b
parent87c0182d3b0a38c58c11249870d5202f944d9acf (diff)
Fix popupitem sizes to match (hardcoded layout sizes of) content
Fix-up for fa8ed7041dd3b74dddf089baa8ca7275483a6e24.
-rw-r--r--src/lib/marble/MarbleWidgetPopupMenu.cpp2
-rw-r--r--src/lib/marble/TourPlayback.cpp2
-rw-r--r--src/plugins/render/panoramio/PanoramioItem.cpp2
-rw-r--r--src/plugins/render/photo/PhotoPluginItem.cpp2
-rw-r--r--src/plugins/render/weather/WeatherItem.cpp2
-rw-r--r--src/plugins/render/wikipedia/WikipediaItem.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/marble/MarbleWidgetPopupMenu.cpp b/src/lib/marble/MarbleWidgetPopupMenu.cpp
index 055c64f..9196054 100644
--- a/src/lib/marble/MarbleWidgetPopupMenu.cpp
+++ b/src/lib/marble/MarbleWidgetPopupMenu.cpp
@@ -690,7 +690,7 @@ void MarbleWidgetPopupMenu::slotInfoDialog()
isSky = d->m_widget->model()->mapTheme()->head()->target() == QLatin1String("sky");
}
- popup->setSize(QSizeF(400, 400));
+ popup->setSize(QSizeF(420, 420));
if (hasOsmData){
d->setupDialogOsm( popup, placemark );
diff --git a/src/lib/marble/TourPlayback.cpp b/src/lib/marble/TourPlayback.cpp
index 6df81a1..629206b 100644
--- a/src/lib/marble/TourPlayback.cpp
+++ b/src/lib/marble/TourPlayback.cpp
@@ -115,7 +115,7 @@ void TourPlayback::showBalloon( GeoDataPlacemark* placemark )
d->m_widget->popupLayer()->setCoordinates( point->coordinates(), Qt::AlignRight | Qt::AlignVCenter );
d->m_widget->popupLayer()->setContent( placemark->description(), d->m_baseUrl );
d->m_widget->popupLayer()->setVisible( true );
- d->m_widget->popupLayer()->setSize( QSizeF( 480, 500 ) );
+ d->m_widget->popupLayer()->setSize(QSizeF(500, 520));
}
void TourPlayback::hideBalloon()
diff --git a/src/plugins/render/panoramio/PanoramioItem.cpp b/src/plugins/render/panoramio/PanoramioItem.cpp
index dffb45b..d846967 100644
--- a/src/plugins/render/panoramio/PanoramioItem.cpp
+++ b/src/plugins/render/panoramio/PanoramioItem.cpp
@@ -94,7 +94,7 @@ void PanoramioItem::openBrowser()
if ( m_marbleWidget ) {
PopupLayer* popup = m_marbleWidget->popupLayer();
popup->setCoordinates( coordinate(), Qt::AlignRight | Qt::AlignVCenter );
- popup->setSize( QSizeF( 700, 450 ) );
+ popup->setSize(QSizeF(720, 470));
popup->setUrl( m_url );
popup->popup();
}
diff --git a/src/plugins/render/photo/PhotoPluginItem.cpp b/src/plugins/render/photo/PhotoPluginItem.cpp
index bdcce8a..e6bef50 100644
--- a/src/plugins/render/photo/PhotoPluginItem.cpp
+++ b/src/plugins/render/photo/PhotoPluginItem.cpp
@@ -186,7 +186,7 @@ void PhotoPluginItem::openBrowser()
if ( m_marbleWidget ) {
PopupLayer* popup = m_marbleWidget->popupLayer();
popup->setCoordinates( coordinate(), Qt::AlignRight | Qt::AlignVCenter );
- popup->setSize( QSizeF( 700, 450 ) );
+ popup->setSize(QSizeF(720, 470));
popup->setUrl(QUrl(QLatin1String("http://m.flickr.com/photos/") + owner() + QLatin1Char('/') + id() + QLatin1Char('/')));
popup->popup();
} else {
diff --git a/src/plugins/render/weather/WeatherItem.cpp b/src/plugins/render/weather/WeatherItem.cpp
index eafd1a0..e04d1fe 100644
--- a/src/plugins/render/weather/WeatherItem.cpp
+++ b/src/plugins/render/weather/WeatherItem.cpp
@@ -481,7 +481,7 @@ void WeatherItem::openBrowser()
if (d->m_marbleWidget) {
PopupLayer *popup = d->m_marbleWidget->popupLayer();
popup->setCoordinates( coordinate(), Qt::AlignRight | Qt::AlignVCenter );
- popup->setSize( QSizeF( 610, 550 ) ); // +10 pixels for the width
+ popup->setSize(QSizeF(630, 580)); // +10 pixels for the width
popup->popup();
QFile weatherHtmlFile(QStringLiteral(":/marble/weather/weather.html"));
diff --git a/src/plugins/render/wikipedia/WikipediaItem.cpp b/src/plugins/render/wikipedia/WikipediaItem.cpp
index 1a87d87..f86ae3b 100644
--- a/src/plugins/render/wikipedia/WikipediaItem.cpp
+++ b/src/plugins/render/wikipedia/WikipediaItem.cpp
@@ -170,7 +170,7 @@ void WikipediaItem::openBrowser( )
if ( m_marbleWidget ) {
PopupLayer* popup = m_marbleWidget->popupLayer();
popup->setCoordinates( coordinate(), Qt::AlignRight | Qt::AlignVCenter );
- popup->setSize( QSizeF( 500, 550 ) );
+ popup->setSize(QSizeF(520, 570));
popup->setUrl( url() );
popup->popup();
} else {