summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-01 14:48:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-01 14:48:56 +0000
commit31ce63759fa4a3111634bb6e1d5dd05c314a427f (patch)
tree5b795195433bcf90f215d3e6f656a90c9e047cff /kicker
parent0d9a6be5785791ac0e91c5f6746d12f0fc5d2d4e (diff)
downloadtdebase-31ce63759fa4a3111634bb6e1d5dd05c314a427f.tar.gz
tdebase-31ce63759fa4a3111634bb6e1d5dd05c314a427f.zip
Fix kicker size/position glitch
Fix kicker task button glitch in Elegant mode caused by prior commit r1246075 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1250790 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/core/container_extension.cpp8
-rw-r--r--kicker/taskbar/taskcontainer.cpp1
2 files changed, 5 insertions, 4 deletions
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index c2023b7d..5b30dbad 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1342,20 +1342,20 @@ int ExtensionContainer::setupBorderSpace()
switch (position())
{
case KPanelExtension::Left:
- _layout->setColSpacing(2, PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
+ _layout->setColSpacing(2, (KickerSettings::useResizeHandle())?PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE:1);
break;
case KPanelExtension::Right:
- _layout->setColSpacing(0, PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
+ _layout->setColSpacing(0, (KickerSettings::useResizeHandle())?PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE:1);
break;
case KPanelExtension::Top:
- _layout->setRowSpacing(2, PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
+ _layout->setRowSpacing(2, (KickerSettings::useResizeHandle())?PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE:1);
break;
case KPanelExtension::Bottom:
default:
- _layout->setRowSpacing(0, PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
+ _layout->setRowSpacing(0, (KickerSettings::useResizeHandle())?PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE:1);
break;
}
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index dee5c12e..037f65b6 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -70,6 +70,7 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar,
taskBar(bar),
discardNextMouseEvent(false),
aboutToActivate(false),
+ m_mouseOver(false),
m_paintEventCompression(false)
{
init();