mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Rethumbed init data, so Desktop::instance() call can be

Browse Source 
called from DesktopIcon constructor. In previous case, Desktop constructor
wasn't finished, but Desktop::instance() was called in the mean time which
yields crashing.
This commit is contained in:
Sanel Zukan
2007-06-29 11:22:29 +00:00
parent 186b594f2d
commit 4521b56042
4 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
eiconman/DesktopIcon.cpp
View File

@@ -86,11 +86,26 @@ DesktopIcon::DesktopIcon(GlobalIconSettings* gs, IconSettings* is, int bg) :
} else
EDEBUG(ESTRLOC ": Got empty icon name ?!?\n");
}
/*
EDEBUG(ESTRLOC ": Got label: %s\n", label());
EDEBUG(ESTRLOC ": Got image: %s\n", settings->icon.c_str());
EDEBUG(ESTRLOC ": Got x/y : %i %i\n", x(), y());
*/
// make sure icons are visible on desktop
int dx = Desktop::instance()->x();
int dy = Desktop::instance()->y();
int dw = Desktop::instance()->w();
int dh = Desktop::instance()->h();
int ix = x();
int iy = y();
if(x() < dx)
ix = dx;
if(y() < dy)
iy = dy;
if(x() + w() > dw)
ix = (dx + dw) - w();
if(y() + h() > dh)
iy = (dy + dh) - h();
position(ix, iy);
//Use desktop color as color for icon background
color(bg);