|
|
652846 |
diff -up kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp.kcm_fonts_dont_change_on_load kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp
|
|
|
652846 |
--- kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp.kcm_fonts_dont_change_on_load 2013-03-01 00:32:24.000000000 -0600
|
|
|
652846 |
+++ kde-workspace-4.10.2/kcontrol/fonts/fonts.cpp 2013-05-03 07:22:57.033141204 -0500
|
|
|
652846 |
@@ -330,14 +330,9 @@ bool FontAASettings::load()
|
|
|
652846 |
|
|
|
652846 |
if(!xft.getHintStyle(hStyle) || KXftConfig::Hint::NotSet==hStyle)
|
|
|
652846 |
{
|
|
|
652846 |
- KConfig kglobals("kdeglobals", KConfig::NoGlobals);
|
|
|
652846 |
-
|
|
|
652846 |
hStyle=KXftConfig::Hint::Medium;
|
|
|
652846 |
xft.setHintStyle(hStyle);
|
|
|
652846 |
- xft.apply(); // Save this setting
|
|
|
652846 |
- KConfigGroup(&kglobals, "General").writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
|
|
|
652846 |
- kglobals.sync();
|
|
|
652846 |
- runRdb(KRdbExportXftSettings | KRdbExportGtkTheme);
|
|
|
652846 |
+ changesMade = true;
|
|
|
652846 |
}
|
|
|
652846 |
|
|
|
652846 |
hintingStyle->setCurrentIndex(getIndex(hStyle));
|
|
|
652846 |
diff -up kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp.kcm_fonts_dont_change_on_load kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp
|
|
|
652846 |
--- kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp.kcm_fonts_dont_change_on_load 2013-03-01 00:32:24.056859289 -0600
|
|
|
652846 |
+++ kde-workspace-4.10.2/kcontrol/fonts/kxftconfig.cpp 2013-05-03 07:13:43.182065296 -0500
|
|
|
652846 |
@@ -282,7 +282,6 @@ bool KXftConfig::reset()
|
|
|
652846 |
m_excludePixelRange.from=pFrom;
|
|
|
652846 |
m_excludePixelRange.to=pTo;
|
|
|
652846 |
m_madeChanges=true;
|
|
|
652846 |
- apply();
|
|
|
652846 |
}
|
|
|
652846 |
}
|
|
|
652846 |
else if(!equal(0, m_excludePixelRange.from) || !equal(0, m_excludePixelRange.to))
|
|
|
652846 |
@@ -291,7 +290,6 @@ bool KXftConfig::reset()
|
|
|
652846 |
m_excludeRange.from=(int)pixel2Point(m_excludePixelRange.from);
|
|
|
652846 |
m_excludeRange.to=(int)pixel2Point(m_excludePixelRange.to);
|
|
|
652846 |
m_madeChanges=true;
|
|
|
652846 |
- apply();
|
|
|
652846 |
}
|
|
|
652846 |
}
|
|
|
652846 |
|