1. === modified file 'src/libnrtype/font-lister.cpp'
  2. --- src/libnrtype/font-lister.cpp 2015-05-09 15:39:31 +0000
  3. +++ src/libnrtype/font-lister.cpp 2015-11-07 03:28:32 +0000
  4. @@ -5,6 +5,7 @@
  5. #include <gtkmm/liststore.h>
  6. #include <gtkmm/treemodel.h>
  7. +#include "libnrtype/FontFactory.h"
  8. #include <libnrtype/font-instance.h>
  9. #include <libnrtype/TextWrapper.h>
  10. #include <libnrtype/one-glyph.h>
  11. @@ -123,9 +124,14 @@
  12. }
  13. }
  14. -FontLister *FontLister::get_instance()
  15. +FontLister *FontLister::get_instance(bool refresh)
  16. {
  17. static Inkscape::FontLister *instance = new Inkscape::FontLister();
  18. + if(refresh){
  19. + PangoFontMap * fontmap = pango_cairo_font_map_get_default();
  20. + font_factory::fontServer = fontmap;
  21. + instance = new Inkscape::FontLister();
  22. + }
  23. return instance;
  24. }
  25. === modified file 'src/libnrtype/font-lister.h'
  26. --- src/libnrtype/font-lister.h 2014-10-17 20:03:14 +0000
  27. +++ src/libnrtype/font-lister.h 2015-11-07 01:20:07 +0000
  28. @@ -150,7 +150,7 @@
  29. void update_font_list(SPDocument *document);
  30. public:
  31. - static Inkscape::FontLister *get_instance();
  32. + static Inkscape::FontLister *get_instance(bool refresh = false);
  33. /**
  34. * Takes a hand written font spec and returns a Pango generated one in
  35. === modified file 'src/widgets/text-toolbar.cpp'
  36. --- src/widgets/text-toolbar.cpp 2015-04-29 20:51:23 +0000
  37. +++ src/widgets/text-toolbar.cpp 2015-11-07 01:22:26 +0000
  38. @@ -855,7 +855,7 @@
  39. Ink_ComboBoxEntry_Action* fontStyleAction =
  40. INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction" ) );
  41. - Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
  42. + Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(true);
  43. if (!subselection) {
  44. fontlister->update_font_list( SP_ACTIVE_DESKTOP->getDocument());
  45. }
 
 

61

 

1106

Pasted Text #1002

-

PasteBin

Linhas
53
Palavras
161
Tamanho
1,9 KB
Criado
Tipo
text/plain
Public Domain (PD)
Por favor faça seu login para deixar um comentário!