From 9e611d444e209c9ad41b84dd345862057790ffb7 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 3 Jun 2021 20:28:39 +0300 Subject: [PATCH] data::screen,add isRemovable flag --- app/data/screendata.cpp | 7 +++++++ app/data/screendata.h | 1 + 2 files changed, 8 insertions(+) diff --git a/app/data/screendata.cpp b/app/data/screendata.cpp index 1a659acf0..2f7116ce0 100644 --- a/app/data/screendata.cpp +++ b/app/data/screendata.cpp @@ -14,6 +14,7 @@ Screen::Screen() : Generic(), hasExplicitViews(false), isActive(false), + isRemovable(false), isSelected(false), geometry(QRect(0, 0, 1920, 1080)) { @@ -23,6 +24,7 @@ Screen::Screen(Screen &&o) : Generic(o), hasExplicitViews(o.hasExplicitViews), isActive(o.isActive), + isRemovable(o.isRemovable), isSelected(o.isSelected), geometry(o.geometry) { @@ -32,6 +34,7 @@ Screen::Screen(const Screen &o) : Generic(o), hasExplicitViews(o.hasExplicitViews), isActive(o.isActive), + isRemovable(o.isRemovable), isSelected(o.isSelected), geometry(o.geometry) { @@ -50,6 +53,7 @@ Screen &Screen::operator=(const Screen &rhs) hasExplicitViews = rhs.hasExplicitViews; isActive = rhs.isActive; isSelected = rhs.isSelected; + isRemovable = rhs.isRemovable; geometry = rhs.geometry; return (*this); @@ -61,6 +65,7 @@ Screen &Screen::operator=(Screen &&rhs) name = rhs.name; hasExplicitViews = rhs.hasExplicitViews; isActive = rhs.isActive; + isRemovable = rhs.isRemovable; isSelected = rhs.isSelected; geometry = rhs.geometry; @@ -73,6 +78,7 @@ bool Screen::operator==(const Screen &rhs) const && (name == rhs.name) && (hasExplicitViews == rhs.hasExplicitViews) //&& (isActive == rhs.isActive) /*Disabled because this is not a data but a screen state*/ + //&& (isRemovable == rhs.isRemovable) /*Disabled because this is not a data but a screen state*/ && (isSelected == rhs.isSelected) && (geometry == rhs.geometry); } @@ -89,6 +95,7 @@ void Screen::init(const QString &screenId, const QString &serialized) id = screenId; name = parts[0]; isActive = false; + isRemovable = false; isSelected = false; if (parts.count() > 1) { diff --git a/app/data/screendata.h b/app/data/screendata.h index b8bd4fedd..f8a314c87 100644 --- a/app/data/screendata.h +++ b/app/data/screendata.h @@ -33,6 +33,7 @@ public: //! Screen data bool hasExplicitViews{false}; bool isActive{false}; + bool isRemovable{false}; bool isSelected{false}; QRect geometry;