diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-10-15 18:56:16 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-10-15 18:56:16 +0000 |
| commit | 58989cdb66d715f968d4c3e77fd13532c92e1fda (patch) | |
| tree | 3ae5fad83e24b42753aa14e117d06ff810abc40d /src/ui | |
| parent | Fix build (diff) | |
| parent | Various small font things. (diff) | |
| download | inkscape-58989cdb66d715f968d4c3e77fd13532c92e1fda.tar.gz inkscape-58989cdb66d715f968d4c3e77fd13532c92e1fda.zip | |
Font caching from experimental branch. Speeds up Inkscape start-up.
Most work by Liam. Various tweeks by Tav.
(bzr r13617)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/text-edit.cpp | 6 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index a00db1715..9996fc0f9 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -343,9 +343,9 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ ) Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); - // This is done for us by text-toolbar. No need to do it twice. - // fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP )); - // fontlister->selection_update(); + // This is normally done for us by text-toolbar but only when we are in text editing context + fontlister->update_font_list(sp_desktop_document(this->desktop)); + fontlister->selection_update(); Glib::ustring fontspec = fontlister->get_fontspec(); diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index f1d90f6c6..1c1e8a17a 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -18,6 +18,8 @@ # include "config.h" #endif +#include "widgets/desktop-widget.h" + #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> #endif @@ -40,7 +42,6 @@ #include "desktop-handles.h" #include "desktop-events.h" #include "desktop-style.h" -#include "widgets/desktop-widget.h" #include "sp-namedview.h" #include "selection.h" #include "interface.h" |