summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-21 18:05:12 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-21 18:05:12 +0000
commitb3227b675d733c6e88cdadec7d8ab524b2c8b040 (patch)
tree6c90f36b2f65e361e769b4fe80c29b8163a9b2fc
parentc47eb0fc49c92b86c2898b85f8df3d2f3af58dae (diff)
downloadtdebase-b3227b675d733c6e88cdadec7d8ab524b2c8b040.tar.gz
tdebase-b3227b675d733c6e88cdadec7d8ab524b2c8b040.zip
Attempt to fix desktop icon scrambling on logout/login
Added debugging for XBadWindow problem git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1177931 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdesktop/kdiconview.cc4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp1
-rw-r--r--kwin/kompmgr/kompmgr.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 66796ca3..4124a3e8 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -1082,7 +1082,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
TQRect oldPos = fileIVI->rect();
fileIVI->move( x, y );
- if ( !firstRun && !isFreePosition( fileIVI ) ) // if we can't put it there, then let TQIconView decide
+ if ( (!firstRun) && (!isFreePosition( fileIVI )) && (!m_needDesktopAlign) ) // if we can't put it there, then let TQIconView decide
{
kdDebug(1214)<<"slotNewItems() pos was not free :-("<<endl;
fileIVI->move( oldPos.x(), oldPos.y() );
@@ -1496,7 +1496,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid repaint/saveIconPosition ...
-// m_needDesktopAlign = false;
+ m_needDesktopAlign = false;
lineupIcons();
TQRect oldArea = iconArea();
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index ad44b640..d729c6b5 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -1081,6 +1081,7 @@ void TrayEmbed::setBackground()
if (!isHidden())
{
+ printf("[systemtray] Clearing area to set background\n\r");
XClearArea(x11Display(), embeddedWinId(), 0, 0, 0, 0, True);
}
}
diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c
index a91d0a3d..713752ee 100644
--- a/kwin/kompmgr/kompmgr.c
+++ b/kwin/kompmgr/kompmgr.c
@@ -30,7 +30,7 @@
/* Modified by Dan Doel*/
/*
-Version 2.x of xcompmgr, kompmgr changes by Thomas LŘbking and Heiko Przybyl
+Version 2.x of xcompmgr, kompmgr changes by Thomas L´┐Żbking and Heiko Przybyl
check baghira.sf.net for more infos
*/
#define _VERSION_ 2.02
@@ -2265,7 +2265,7 @@ ev_window (XEvent *ev)
}
void
-setShadowColor(char *value){ /*format nach #xxxxxx (html) ńndern?*/
+setShadowColor(char *value){ /*format nach #xxxxxx (html) ´┐Żndern?*/
unsigned int tmp;
char **res = NULL;
tmp = strtoul(value, res, 16);