commit 43dd383073fc61cfe5f24b87294c4e8698a1827a
Author: Stephan Witt <[email protected]>
Date: Fri May 22 21:53:37 2015 +0200
avoid float-conversion warning and simplify size computation
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 8ce2811..e6fda91 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -236,24 +236,18 @@ private:
#endif
}
- qreal fontSize() {
+ qreal fontSize() const {
return toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble();
}
- QPointF textPosition() {
- return QPointF(splashWidth()/2 - 16, splashHeigth() - 40);
+ QPointF textPosition() const {
+ return QPointF(width_/2 - 16, height_ - 40);
}
- QSize splashSize() {
- return QSize(width_ * pixelRatio(),height_ * pixelRatio());
- }
-
- double splashWidth() {
- return splash_.width()/splashPixelRatio();
- }
-
- double splashHeigth() {
- return splash_.height()/splashPixelRatio();
+ QSize splashSize() const {
+ return QSize(
+ static_cast<unsigned int>(width_ * pixelRatio()),
+ static_cast<unsigned int>(height_ * pixelRatio()));
}
/// Ratio between physical pixels and device-independent pixels of
splash image