From ae56bd6349992b95e44850a930440f81538545c5 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 24 Feb 2013 15:31:21 +0100 Subject: Fix for font-family scrolling in text-tool tool-controls (bug 1122553). (bzr r12149) --- src/libnrtype/font-lister.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/libnrtype') diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 57a019e96..5e67c5991 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -10,7 +10,6 @@ #include #include #include - #include "font-lister.h" #include "FontFactory.h" @@ -364,10 +363,11 @@ namespace Inkscape set_font_family( ui.first ); #ifdef DEBUG_FONT - std::cout << " canonized: :" << current_fontspec << ":" << std::endl; - std::cout << " system: :" << current_fontspec_system << ":" << std::endl; - std::cout << " family: :" << current_family << ":" << std::endl; - std::cout << " style: :" << current_style << ":" << std::endl; + std::cout << " family_row: :" << current_family_row << ":" << std::endl; + std::cout << " canonized: :" << current_fontspec << ":" << std::endl; + std::cout << " system: :" << current_fontspec_system << ":" << std::endl; + std::cout << " family: :" << current_family << ":" << std::endl; + std::cout << " style: :" << current_style << ":" << std::endl; std::cout << "FontLister::selection_update: exit" << std::endl; std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl; #endif @@ -485,6 +485,7 @@ namespace Inkscape current_fontspec_system = system_fontspec( current_fontspec ); #ifdef DEBUG_FONT + std::cout << " family_row: :" << current_family_row << ":" << std::endl; std::cout << " canonized: :" << current_fontspec << ":" << std::endl; std::cout << " system: :" << current_fontspec_system << ":" << std::endl; std::cout << " family: :" << current_family << ":" << std::endl; @@ -510,7 +511,7 @@ namespace Inkscape Glib::ustring new_family = current_family; Gtk::TreeModel::iterator iter = font_list_store->get_iter( path ); if( iter ) { - current_family = (*iter)[FontList.family]; + new_family = (*iter)[FontList.family]; } std::pair ui = set_font_family( new_family, check_style ); -- cgit v1.2.3