This commit is contained in:
vaxerski 2021-12-19 19:50:57 +01:00
parent 43ea3674d4
commit 22983f40f3
3 changed files with 1 additions and 14 deletions

View file

@ -1,7 +1,7 @@
#include "window.hpp" #include "window.hpp"
#include "windowManager.hpp" #include "windowManager.hpp"
CWindow::CWindow() { this->setRounded(false); this->setLastUpdatePosition(Vector2D(0,0)); this->setLastUpdateSize(Vector2D(0,0)); this->setDock(false); this->setUnderFullscreen(false); this->setIsSleeping(true); this->setFirstAnimFrame(true); this->setIsAnimated(false); this->setDead(false); this->setMasterChildIndex(0); this->setMaster(false); this->setCanKill(false); this->setImmovable(false); this->setNoInterventions(false); this->setDirty(true); this->setFullscreen(false); this->setIsFloating(false); this->setParentNodeID(0); this->setChildNodeAID(0); this->setChildNodeBID(0); this->setName(""); } CWindow::CWindow() { this->setLastUpdatePosition(Vector2D(0,0)); this->setLastUpdateSize(Vector2D(0,0)); this->setDock(false); this->setUnderFullscreen(false); this->setIsSleeping(true); this->setFirstAnimFrame(true); this->setIsAnimated(false); this->setDead(false); this->setMasterChildIndex(0); this->setMaster(false); this->setCanKill(false); this->setImmovable(false); this->setNoInterventions(false); this->setDirty(true); this->setFullscreen(false); this->setIsFloating(false); this->setParentNodeID(0); this->setChildNodeAID(0); this->setChildNodeBID(0); this->setName(""); }
CWindow::~CWindow() { } CWindow::~CWindow() { }
void CWindow::generateNodeID() { void CWindow::generateNodeID() {

View file

@ -95,9 +95,6 @@ public:
EXPOSED_MEMBER(Dock, bool, b); EXPOSED_MEMBER(Dock, bool, b);
EXPOSED_MEMBER(DockAlign, EDockAlign, e); EXPOSED_MEMBER(DockAlign, EDockAlign, e);
// Rounding
EXPOSED_MEMBER(Rounded, bool, b);
private: private:

View file

@ -607,13 +607,6 @@ void CWindowManager::applyShapeToWindow(CWindow* pWindow) {
const auto ROUNDING = pWindow->getFullscreen() ? 0 : ConfigManager::getInt("rounding"); const auto ROUNDING = pWindow->getFullscreen() ? 0 : ConfigManager::getInt("rounding");
if (!pWindow->getRounded() && !ROUNDING)
return;
if (!ROUNDING && pWindow->getRounded()) {
pWindow->setRounded(false);
}
const auto SHAPEQUERY = xcb_get_extension_data(DisplayConnection, &xcb_shape_id); const auto SHAPEQUERY = xcb_get_extension_data(DisplayConnection, &xcb_shape_id);
if (!SHAPEQUERY || !SHAPEQUERY->present || pWindow->getNoInterventions()) if (!SHAPEQUERY || !SHAPEQUERY->present || pWindow->getNoInterventions())
@ -701,9 +694,6 @@ void CWindowManager::applyShapeToWindow(CWindow* pWindow) {
xcb_free_pixmap(DisplayConnection, PIXMAP1); xcb_free_pixmap(DisplayConnection, PIXMAP1);
xcb_free_pixmap(DisplayConnection, PIXMAP2); xcb_free_pixmap(DisplayConnection, PIXMAP2);
if (ROUNDING)
pWindow->setRounded(true);
} }
void CWindowManager::setEffectiveSizePosUsingConfig(CWindow* pWindow) { void CWindowManager::setEffectiveSizePosUsingConfig(CWindow* pWindow) {