Use QFontMetrics information for underlines (and friends) width and position

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 6eb968cdb0dbceffa81fd25943ee1a633cd5407c..7671d59650a91ba051eab38c74d0c263d69525d6 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -570,12 +570,14 @@ QString iconName(FuncRequest const & f, bool unknown)
 bool getPixmap(QPixmap & pixmap, QString const & path)
 {
        if (pixmap.load(path)) {
+#if QT_VERSION >= 0x050000
                if (path.endsWith(".svgz") || path.endsWith(".svg") ) {
                        GuiApplication const * guiApp = theGuiApp();
                        if (guiApp != 0) {
                                pixmap.setDevicePixelRatio(guiApp->pixelRatio());
                        }
                }
+#endif
                return true;
        }
        return false;
@@ -963,6 +965,9 @@ struct GuiApplication::Private
        ///
        KeyModifier meta_fake_bit;
 
+       /// The result of last dispatch action
+       DispatchResult dispatch_result_;
+
        /// Multiple views container.
        /**
        * Warning: This must not be a smart pointer as the destruction of the
@@ -1370,7 +1375,7 @@ static docstring makeDispatchMessage(docstring const & msg,
 }
 
 
-void GuiApplication::dispatch(FuncRequest const & cmd)
+DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd)
 {
        Buffer * buffer = 0;
        if (current_view_ && current_view_->currentBufferView()) {
@@ -1390,6 +1395,9 @@ void GuiApplication::dispatch(FuncRequest const & cmd)
        // the buffer may have been closed by one action
        if (theBufferList().isLoaded(buffer))
                buffer->undo().endUndoGroup();
+
+       d->dispatch_result_ = dr;
+       return d->dispatch_result_;
 }
 
 
@@ -1729,6 +1737,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                }
                // Make sure we don't keep old colors in cache.
                d->color_cache_.clear();
+               // Update the current view
+               lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
                break;
        }
 
@@ -2733,10 +2743,11 @@ void GuiApplication::commitData(QSessionManager & sm)
 
 void GuiApplication::unregisterView(GuiView * gv)
 {
-       LAPPERR(d->views_[gv->id()] == gv);
-       d->views_.remove(gv->id());
-       if (current_view_ == gv)
-               current_view_ = 0;
+       if(d->views_.contains(gv->id()) && d->views_.value(gv->id()) == gv) {
+               d->views_.remove(gv->id());
+               if (current_view_ == gv)
+                       current_view_ = 0;
+       }
 }
 
 
@@ -3074,7 +3085,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
 }
 #elif defined(QPA_XCB)
 bool GuiApplication::nativeEventFilter(const QByteArray & eventType,
-                                      void * message, long *) Q_DECL_OVERRIDE
+                                      void * message, long *)
 {
        if (!current_view_ || eventType != "xcb_generic_event_t")
                return false;