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

List:       kde-core-devel
Subject:    Re: KToolBar::iconSize()
From:       Lubos Lunak <l.lunak () sh ! cvut ! cz>
Date:       2002-02-13 22:52:51
[Download RAW message or body]

On Wed 13. February 2002 23:41, David Faure wrote:
> On Wednesday 13 February 2002 22:18, Scott Wheeler wrote:
[snip]
>
> > I understand what you're saying about the internals of KToolBar.  I'm
> > still pretty new at hacking on the libs that I'm learning as I go.  Aside
> > from staying consistent with other implementations it didn't seem very
> > straightforward.
>
> Isn't it ?
> Suggested patch, posted here for review:
>
> Index: ktoolbar.cpp
> ===================================================================
> RCS file: /home/kde/kdelibs/kdeui/ktoolbar.cpp,v
> retrieving revision 1.306
> diff -u -p -r1.306 ktoolbar.cpp
> --- ktoolbar.cpp        2002/02/09 00:01:24     1.306
> +++ ktoolbar.cpp        2002/02/13 22:39:24
> @@ -926,6 +926,8 @@ void KToolBar::setIconSize(int size, boo
>
>  int KToolBar::iconSize() const
>  {
> +    if ( !d->m_iconSize ) // default value?
> +        return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
>      return d->m_iconSize;
>  }

 I think this one is better (there are two toolbar sizes AFAIK) :
 
--- ktoolbar.cpp.sav    Mon Feb 11 23:02:38 2002
+++ ktoolbar.cpp        Wed Feb 13 23:48:18 2002
@@ -926,6 +926,13 @@ void KToolBar::setIconSize(int size, boo

 int KToolBar::iconSize() const
 {
+    if( !d->m_iconSize ) // default value
+    {
+        if (!::qstrcmp(QObject::name(), "mainToolBar"))
+            return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
+        else
+            return KGlobal::iconLoader()->currentSize(KIcon::Toolbar);
+    }
     return d->m_iconSize;
 }

-- 
 Lubos Lunak
 llunak@suse.cz ; l.lunak@kde.org
 http://dforce.sh.cvut.cz/~seli
[prev in list] [next in list] [prev in thread] [next in thread]