From a70540e7ac28c1fef5ed5e4453beef22d78c8afc Mon Sep 17 00:00:00 2001
From: Mavridis Philippe <mavridisf@gmail.com>
Date: Fri, 22 Jul 2022 15:37:20 +0300
Subject: [PATCH] taskbar: fix text positioning when changing from icons only
 to text&icons

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
---
 kicker/taskbar/taskcontainer.cpp | 14 +++++++++-----
 kicker/taskbar/taskcontainer.h   |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index fb395c7e5..2b497ccd0 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -392,9 +392,13 @@ TQSizePolicy TaskContainer::sizePolicy() const
 
 void TaskContainer::resizeEvent( TQResizeEvent * )
 {
-    int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+    recalculateIconRect();
+}
+
+void TaskContainer::recalculateIconRect()
+{
+    iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
 
-    // calculate the icon rect
     if(taskBar->showText())
     {
         TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
@@ -599,7 +603,7 @@ void TaskContainer::drawButton(TQPainter *p)
                       (m_mouseOver && !halo && isEnabled() &&
                        READ_MERGED_TASKBAR_SETTING(showButtonOnHover));
     TQFont font(TDEGlobalSettings::taskbarFont());
-    int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+    recalculateIconRect();
 
     // draw sunken if we contain the active task
     bool active = false;
@@ -628,7 +632,7 @@ void TaskContainer::drawButton(TQPainter *p)
     font.setBold(active);
 
     TQColorGroup colors = palette().active();
-    
+
     if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
     {
         colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor));
@@ -636,7 +640,7 @@ void TaskContainer::drawButton(TQPainter *p)
         colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
         colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
     }
-    
+
     if (demandsAttention)
     {
         if (!drawButton)
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index f40566e9c..cc95b5f8c 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -118,6 +118,7 @@ protected:
 
     void updateFilteredTaskList();
     void updateIconSize();
+    void recalculateIconRect();
 
 protected slots:
     void animationTimerFired();
@@ -145,6 +146,7 @@ private:
     PixmapList                  frames;
     int                         attentionState;
     TQRect                      iconRect;
+    int                         iconSize;
     TQPixmap                    animBg;
     Task::List                  tasks;
     Task::List                  m_filteredTasks;