Repaired background update problems on desktop resize/background configuration change

Added initial framework for panel icon size configuration


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1123766 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 0 insertions, 2 deletions

diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 34cff9f53..6a7e44234 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -98,7 +98,6 @@ BGDialog::BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop)
    delete m_kwin;
 
    m_desk = m_multidesktop ? KWin::currentDesktop() : 1;
-   //m_desk = m_multidesktop ? (m_useViewports ? (m_desk * m_numViewports) : m_desk) : m_desk;
    m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk;
    m_numDesks = m_multidesktop ? (m_useViewports ? (m_numDesks * m_numViewports) : m_numDesks) : m_numDesks;
    
@@ -320,7 +319,6 @@ void BGDialog::load( bool useDefaults )
       for (unsigned screen = 0; screen < m_renderer[desk].size(); ++screen)
       {
          unsigned eScreen = screen>1 ? screen-2 : 0;
-//          m_renderer[desk][screen]->load( eDesk, eScreen, (screen>0) );
          m_renderer[desk][screen]->load( eDesk, eScreen, (screen>0), useDefaults );
       }
    }