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

Merge branch 'Plasma/5.12' into Plasma/5.15

Browse source
This commit is contained in:
Vlad Zagorodniy 2019-02-05 13:57:09 +02:00
commit 582966db52
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client.cpp
View file

@ -574,9 +574,14 @@ void Client::resizeDecoration()
updateInputWindow(); updateInputWindow();
} }
bool Client::userNoBorder() const
{
return noborder;
}
bool Client::noBorder() const bool Client::noBorder() const
{ {
return noborder || isFullScreen(); return userNoBorder() || isFullScreen();
} }
bool Client::userCanSetNoBorder() const bool Client::userCanSetNoBorder() const

1
client.h
View file

@ -153,6 +153,7 @@ public:
return fullscreen_mode; // only for session saving return fullscreen_mode; // only for session saving
} }
bool userNoBorder() const;
bool noBorder() const override; bool noBorder() const override;
void setNoBorder(bool set) override; void setNoBorder(bool set) override;
bool userCanSetNoBorder() const override; bool userCanSetNoBorder() const override;

4
plugins/platforms/x11/standalone/glxbackend.cpp
View file

@ -115,6 +115,10 @@ GlxBackend::GlxBackend(Display *display)
, haveSwapInterval(false) , haveSwapInterval(false)
, m_x11Display(display) , m_x11Display(display)
{ {
// Force initialization of GLX integration in the Qt's xcb backend
// to make it call XESetWireToEvent callbacks, which is required
// by Mesa when using DRI2.
QOpenGLContext::supportsThreadedOpenGL();
} }
static bool gs_tripleBufferUndetected = true; static bool gs_tripleBufferUndetected = true;

2
sm.cpp
View file

@ -172,7 +172,7 @@ void Workspace::storeClient(KConfigGroup &cg, int num, Client *c)
cg.writeEntry(QLatin1String("skipPager") + n, c->skipPager()); cg.writeEntry(QLatin1String("skipPager") + n, c->skipPager());
cg.writeEntry(QLatin1String("skipSwitcher") + n, c->skipSwitcher()); cg.writeEntry(QLatin1String("skipSwitcher") + n, c->skipSwitcher());
// not really just set by user, but name kept for back. comp. reasons // not really just set by user, but name kept for back. comp. reasons
cg.writeEntry(QLatin1String("userNoBorder") + n, c->noBorder()); cg.writeEntry(QLatin1String("userNoBorder") + n, c->userNoBorder());
cg.writeEntry(QLatin1String("windowType") + n, windowTypeToTxt(c->windowType())); cg.writeEntry(QLatin1String("windowType") + n, windowTypeToTxt(c->windowType()));
cg.writeEntry(QLatin1String("shortcut") + n, c->shortcut().toString()); cg.writeEntry(QLatin1String("shortcut") + n, c->shortcut().toString());
cg.writeEntry(QLatin1String("stackingOrder") + n, unconstrained_stacking_order.indexOf(c)); cg.writeEntry(QLatin1String("stackingOrder") + n, unconstrained_stacking_order.indexOf(c));