yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move adjustedSize from Client to AbstractClient

Browse source
This commit is contained in:
Martin Gräßlin 2015-10-13 09:51:40 +02:00
parent 7c49b1ca42
commit 60342d44e3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
abstract_client.h
View file

@ -413,6 +413,9 @@ public:
*/ */
virtual QSize sizeForClientSize(const QSize &wsize, Sizemode mode = SizemodeAny, bool noframe = false) const; virtual QSize sizeForClientSize(const QSize &wsize, Sizemode mode = SizemodeAny, bool noframe = false) const;
QSize adjustedSize(const QSize&, Sizemode mode = SizemodeAny) const;
QSize adjustedSize() const;
virtual bool hasStrut() const; virtual bool hasStrut() const;
void setModal(bool modal); void setModal(bool modal);

3
client.h
View file

@ -209,9 +209,6 @@ public:
void releaseWindow(bool on_shutdown = false); void releaseWindow(bool on_shutdown = false);
void destroyClient(); void destroyClient();
QSize adjustedSize(const QSize&, Sizemode mode = SizemodeAny) const;
QSize adjustedSize() const;
virtual int desktop() const; virtual int desktop() const;
void sendToScreen(int screen) override; void sendToScreen(int screen) override;

4
geometry.cpp
View file

@ -1271,7 +1271,7 @@ void AbstractClient::checkOffscreenPosition(QRect* geom, const QRect& screenArea
/*! /*!
Adjust the frame size \a frame according to he window's size hints. Adjust the frame size \a frame according to he window's size hints.
*/ */
QSize Client::adjustedSize(const QSize& frame, Sizemode mode) const QSize AbstractClient::adjustedSize(const QSize& frame, Sizemode mode) const
{ {
// first, get the window size for the given frame size s // first, get the window size for the given frame size s
QSize wsize(frame.width() - (borderLeft() + borderRight()), QSize wsize(frame.width() - (borderLeft() + borderRight()),
@ -1284,7 +1284,7 @@ QSize Client::adjustedSize(const QSize& frame, Sizemode mode) const
// this helper returns proper size even if the window is shaded // this helper returns proper size even if the window is shaded
// see also the comment in Client::setGeometry() // see also the comment in Client::setGeometry()
QSize Client::adjustedSize() const QSize AbstractClient::adjustedSize() const
{ {
return sizeForClientSize(clientSize()); return sizeForClientSize(clientSize());
} }