whoops, restoring binary compatibility in case we want it (SC was given)
svn path=/trunk/kdebase/kwin/; revision=100140icc-effect-5.14.5
parent
8e8dce5e64
commit
5a49a411dd
|
@ -18,7 +18,7 @@ kwinincludedir = $(includedir)/kwin
|
||||||
kwininclude_HEADERS = options.h client.h workspace.h
|
kwininclude_HEADERS = options.h client.h workspace.h
|
||||||
|
|
||||||
kwin_SOURCES = kwin_main.cpp
|
kwin_SOURCES = kwin_main.cpp
|
||||||
kwin_LDADD = kwin.la $(LIBXINERAMA)
|
kwin_LDADD = kwin.la
|
||||||
kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||||
|
|
||||||
KDE_ICON = kwin
|
KDE_ICON = kwin
|
||||||
|
|
|
@ -2885,10 +2885,10 @@ QPoint Workspace::adjustClientPosition( Client* c, QPoint pos )
|
||||||
for (l = clients.begin();l != clients.end();++l )
|
for (l = clients.begin();l != clients.end();++l )
|
||||||
{
|
{
|
||||||
if ((*l)->isOnDesktop(currentDesktop()) && (*l) != desktop_client &&
|
if ((*l)->isOnDesktop(currentDesktop()) && (*l) != desktop_client &&
|
||||||
!(*l)->isIconified()
|
!(*l)->isIconified()
|
||||||
#if 0
|
#if 0
|
||||||
&& (*l)->transientFor() == None
|
&& (*l)->transientFor() == None
|
||||||
#endif
|
#endif
|
||||||
&& (*l) != c )
|
&& (*l) != c )
|
||||||
{
|
{
|
||||||
lx = (*l)->x();
|
lx = (*l)->x();
|
||||||
|
@ -3643,6 +3643,11 @@ QRect Workspace::clientArea(clientAreaOption opt)
|
||||||
return area.intersect(rect);
|
return area.intersect(rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ### KDE3: remove me!
|
||||||
|
QRect Workspace::clientArea()
|
||||||
|
{
|
||||||
|
return clientArea( MaximizeArea );
|
||||||
|
}
|
||||||
|
|
||||||
void Workspace::loadDesktopSettings()
|
void Workspace::loadDesktopSettings()
|
||||||
{
|
{
|
||||||
|
@ -3730,5 +3735,5 @@ void Workspace::checkStartOnDesktop( WId w )
|
||||||
if( info.desktop() == 0 )
|
if( info.desktop() == 0 )
|
||||||
info.setDesktop( data.desktop());
|
info.setDesktop( data.desktop());
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "workspace.moc"
|
#include "workspace.moc"
|
||||||
|
|
|
@ -115,7 +115,10 @@ public:
|
||||||
|
|
||||||
enum clientAreaOption { PlacementArea, MovementArea, MaximizeArea };
|
enum clientAreaOption { PlacementArea, MovementArea, MaximizeArea };
|
||||||
|
|
||||||
QRect clientArea(clientAreaOption opt = MaximizeArea);
|
|
||||||
|
// default is MaximizeArea
|
||||||
|
QRect clientArea(); // ### KDE3: remove me!
|
||||||
|
QRect clientArea(clientAreaOption);
|
||||||
|
|
||||||
void removeClient( Client* );
|
void removeClient( Client* );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue