From 6fb27623653d63ff45376cbe7397e01d474dfef2 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 24 Mar 2021 00:12:50 +0200 Subject: [PATCH] introduce layout data isconsideredactive state --it can be used to identify activeness based on each consumer criteria --- app/data/layoutdata.cpp | 7 ++++++- app/data/layoutdata.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/data/layoutdata.cpp b/app/data/layoutdata.cpp index ebba7196f..fe32639ee 100644 --- a/app/data/layoutdata.cpp +++ b/app/data/layoutdata.cpp @@ -39,6 +39,7 @@ Layout::Layout(Layout &&o) textColor(o.textColor), lastUsedActivity(o.lastUsedActivity), isActive(o.isActive), + isConsideredActive(o.isConsideredActive), isBroken(o.isBroken), isLocked(o.isLocked), isShownInMenu(o.isShownInMenu), @@ -58,6 +59,7 @@ Layout::Layout(const Layout &o) textColor(o.textColor), lastUsedActivity(o.lastUsedActivity), isActive(o.isActive), + isConsideredActive(o.isConsideredActive), isBroken(o.isBroken), isLocked(o.isLocked), isShownInMenu(o.isShownInMenu), @@ -79,6 +81,7 @@ Layout &Layout::operator=(Layout &&rhs) textColor = rhs.textColor; lastUsedActivity = rhs.lastUsedActivity; isActive = rhs.isActive; + isConsideredActive = rhs.isConsideredActive; isBroken = rhs.isBroken; isLocked = rhs.isLocked; isShownInMenu = rhs.isShownInMenu; @@ -101,6 +104,7 @@ Layout &Layout::operator=(const Layout &rhs) textColor = rhs.textColor; lastUsedActivity = rhs.lastUsedActivity; isActive = rhs.isActive; + isConsideredActive = rhs.isConsideredActive; isBroken = rhs.isBroken; isLocked = rhs.isLocked; isShownInMenu = rhs.isShownInMenu; @@ -123,7 +127,8 @@ bool Layout::operator==(const Layout &rhs) const && (textColor == rhs.textColor) && (isBroken == rhs.isBroken) //&& (lastUsedActivity == rhs.lastUsedActivity) /*Disabled because it can change too often*/ - //&& (isActive == rhs.isActive) /*Disabled but this is not a data but a layout state*/ + //&& (isActive == rhs.isActive) /*Disabled because this is not a data but a layout state*/ + //&& (isConsideredActive == rhs.isConsideredActive) /*Disabled because this is not a data but a layout state*/ && (isLocked == rhs.isLocked) && (isShownInMenu == rhs.isShownInMenu) && (isTemplate == rhs.isTemplate) diff --git a/app/data/layoutdata.h b/app/data/layoutdata.h index 153307854..fd9b80177 100644 --- a/app/data/layoutdata.h +++ b/app/data/layoutdata.h @@ -52,6 +52,7 @@ public: QString textColor; QString lastUsedActivity; bool isActive{false}; + bool isConsideredActive{false}; //used from settings window to indicate activeness based on selected layouts mode bool isBroken{false}; bool isLocked{false}; bool isShownInMenu{false};