Fix my breakage. Sorry guys.

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index e76eaf3052af1385e0e7a23c6ba38dded5e9dde2..bc8b3ee1484c07e63f93b4dddb5eb02ec9886fbc 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -56,6 +56,7 @@
 #include "frontends/Alert.h"
 #include "frontends/Dialogs.h"
 #include "frontends/FileDialog.h"
+#include "frontends/font_metrics.h"
 #include "frontends/LyXView.h"
 #include "frontends/LyXScreenFactory.h"
 #include "frontends/screen.h"
@@ -64,11 +65,11 @@
 
 #include "graphics/Previews.h"
 
+#include "support/convert.h"
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
 #include "support/forkedcontr.h"
-#include "support/path_defines.h"
-#include "support/tostr.h"
+#include "support/package.h"
 #include "support/types.h"
 
 #include <boost/bind.hpp>
@@ -85,8 +86,8 @@ using lyx::support::ForkedcallsController;
 using lyx::support::IsDirWriteable;
 using lyx::support::MakeDisplayPath;
 using lyx::support::MakeAbsPath;
+using lyx::support::package;
 using lyx::support::strToUnsignedInt;
-using lyx::support::system_lyxdir;
 
 using std::endl;
 using std::istringstream;
@@ -586,8 +587,9 @@ void BufferView::Pimpl::workAreaResize()
 bool BufferView::Pimpl::fitCursor()
 {
        if (bv_funcs::status(bv_, bv_->cursor()) == bv_funcs::CUR_INSIDE) {
-               int asc, des;
-               bv_->cursor().getDim(asc, des);
+               LyXFont const font = bv_->cursor().getFont();
+               int const asc = font_metrics::maxAscent(font);
+               int const des = font_metrics::maxDescent(font);
                Point p = bv_funcs::getPos(bv_->cursor());
                if (p.y_ - asc >= 0 && p.y_ + des < bv_->workHeight())
                        return false;
@@ -777,7 +779,7 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filenm)
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
                        make_pair(string(_("Examples|#E#e")),
-                                 string(AddPath(system_lyxdir(), "examples"))));
+                                 string(AddPath(package().system_support(), "examples"))));
 
                FileDialog::Result result =
                        fileDlg.open(initpath,