fixed some EBN issues
svn path=/trunk/KDE/kdebase/workspace/; revision=546993
This commit is contained in:
parent
750d4f1d03
commit
d68dafda6b
5 changed files with 6 additions and 6 deletions
|
@ -50,7 +50,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent)
|
||||||
{
|
{
|
||||||
setAttribute(Qt::WA_NoSystemBackground);
|
setAttribute(Qt::WA_NoSystemBackground);
|
||||||
|
|
||||||
// no need to reset here as the button will be resetted on first resize.
|
// no need to reset here as the button will be reseted on first resize.
|
||||||
|
|
||||||
animTmr = new QTimer(this);
|
animTmr = new QTimer(this);
|
||||||
animTmr->setSingleShot(true); // single-shot
|
animTmr->setSingleShot(true); // single-shot
|
||||||
|
|
|
@ -302,9 +302,9 @@ bool Workspace::workspaceEvent( XEvent * e )
|
||||||
// If the system tray gets destroyed, the system tray
|
// If the system tray gets destroyed, the system tray
|
||||||
// icons automatically get unmapped, reparented and mapped
|
// icons automatically get unmapped, reparented and mapped
|
||||||
// again to the closest non-client ancestor due to
|
// again to the closest non-client ancestor due to
|
||||||
// QXEmbed's SaveSet feature. Unfortunatly with kicker
|
// QXEmbed's SaveSet feature. Unfortunately with kicker
|
||||||
// this closest ancestor is not the root window, but our
|
// this closest ancestor is not the root window, but our
|
||||||
// decoration, so we reparent explicitely back to the root
|
// decoration, so we reparent explicitly back to the root
|
||||||
// window.
|
// window.
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
WId w = e->xunmap.window;
|
WId w = e->xunmap.window;
|
||||||
|
|
|
@ -393,7 +393,7 @@ void ButtonDropSite::dropEvent( QDropEvent* e )
|
||||||
} else {
|
} else {
|
||||||
ButtonDropSiteItem *aboveItem = buttonAt(p);
|
ButtonDropSiteItem *aboveItem = buttonAt(p);
|
||||||
if (!aboveItem)
|
if (!aboveItem)
|
||||||
return; // invalid drop. hasn't occured _over_ a button (or left/right dropArea), return...
|
return; // invalid drop. hasn't occurred _over_ a button (or left/right dropArea), return...
|
||||||
|
|
||||||
ButtonList::iterator it;
|
ButtonList::iterator it;
|
||||||
if (!getItemIterator(aboveItem, buttonList, it) ) {
|
if (!getItemIterator(aboveItem, buttonList, it) ) {
|
||||||
|
|
2
sm.cpp
2
sm.cpp
|
@ -314,7 +314,7 @@ NET::WindowType Workspace::txtToWindowType( const char* txt )
|
||||||
// Therefore it's temporarily disabled during session saving. Start of
|
// Therefore it's temporarily disabled during session saving. Start of
|
||||||
// session saving can be detected in SessionManaged::saveState() above,
|
// session saving can be detected in SessionManaged::saveState() above,
|
||||||
// but Qt doesn't have API for saying when session saved finished (either
|
// but Qt doesn't have API for saying when session saved finished (either
|
||||||
// successfully, or was cancelled). Therefore, create another connection
|
// successfully, or was canceled). Therefore, create another connection
|
||||||
// to session manager, that will provide this information.
|
// to session manager, that will provide this information.
|
||||||
static void save_yourself( SmcConn conn_P, SmPointer ptr, int, Bool, int, Bool )
|
static void save_yourself( SmcConn conn_P, SmPointer ptr, int, Bool, int, Bool )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue