data::screen,add isRemovable flag

pull/22/head
Michail Vourlakos 4 years ago
parent fabd5f864d
commit 9e611d444e

@ -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) {

@ -33,6 +33,7 @@ public:
//! Screen data
bool hasExplicitViews{false};
bool isActive{false};
bool isRemovable{false};
bool isSelected{false};
QRect geometry;

Loading…
Cancel
Save