[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdeui
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2003-06-24 4:12:02
[Download RAW message or body]

CVS commit by bmeyer: 

Default Size and Text were not being set after the config was read in the
if().  The reason being that iconsize and icontext are set in the if() and
else, but d->IconSizeDefault and d->IconTextDefault don't need to be set in
the else, but they do in the if because the config->readEntry() would
change icontex and iconsize which should match the d-> vars at the end
of this block of code even though the d-> vars need to be read in before
the if() because the config() needed them as default variables.

End result (what should have been happening all along):
Toolbar "IconSize" will only be saved in the config() if the size has
_actually_ changed.


  M +2 -0      ktoolbar.cpp   1.342


--- kdelibs/kdeui/ktoolbar.cpp  #1.341:1.342
@@ -1554,4 +1554,6 @@ void KToolBar::applyAppearanceSettings(K
             // now get the size
             iconsize = config->readNumEntry(attrSize, d->IconSizeDefault);
+            d->IconSizeDefault = iconsize;
+            d->IconTextDefault = icontext;
         }
         else


[prev in list] [next in list] [prev in thread] [next in thread]