aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/modelinglib
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/modelinglib')
-rw-r--r--src/libs/modelinglib/qmt/style/defaultstyleengine.cpp56
-rw-r--r--src/libs/modelinglib/qmt/style/defaultstyleengine.h5
2 files changed, 28 insertions, 33 deletions
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
index 676b56d2aef..2c9e481e255 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -253,6 +253,34 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, StyleE
return derivedStyle;
}
+static bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
+ DObject::VisualSecondaryRole rhsSecondaryRole,
+ DObject::VisualPrimaryRole lhsPrimaryRole,
+ DObject::VisualSecondaryRole lhsSecondaryRols)
+{
+ switch (rhsSecondaryRole) {
+ case DObject::SecondaryRoleNone:
+ case DObject::SecondaryRoleLighter:
+ case DObject::SecondaryRoleDarker:
+ case DObject::SecondaryRoleFlat:
+ switch (lhsSecondaryRols) {
+ case DObject::SecondaryRoleNone:
+ case DObject::SecondaryRoleLighter:
+ case DObject::SecondaryRoleDarker:
+ case DObject::SecondaryRoleFlat:
+ return lhsPrimaryRole == rhsPrimaryRole;
+ case DObject::SecondaryRoleSoften:
+ case DObject::SecondaryRoleOutline:
+ return false;
+ }
+ break;
+ case DObject::SecondaryRoleSoften:
+ case DObject::SecondaryRoleOutline:
+ return false;
+ }
+ return true;
+}
+
const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject,
const Parameters *parameters)
{
@@ -471,34 +499,6 @@ DefaultStyleEngine::ElementType DefaultStyleEngine::objectType(const DObject *ob
return elementType;
}
-bool DefaultStyleEngine::areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
- DObject::VisualSecondaryRole rhsSecondaryRole,
- DObject::VisualPrimaryRole lhsPrimaryRole,
- DObject::VisualSecondaryRole lhsSecondaryRols)
-{
- switch (rhsSecondaryRole) {
- case DObject::SecondaryRoleNone:
- case DObject::SecondaryRoleLighter:
- case DObject::SecondaryRoleDarker:
- case DObject::SecondaryRoleFlat:
- switch (lhsSecondaryRols) {
- case DObject::SecondaryRoleNone:
- case DObject::SecondaryRoleLighter:
- case DObject::SecondaryRoleDarker:
- case DObject::SecondaryRoleFlat:
- return lhsPrimaryRole == rhsPrimaryRole;
- case DObject::SecondaryRoleSoften:
- case DObject::SecondaryRoleOutline:
- return false;
- }
- break;
- case DObject::SecondaryRoleSoften:
- case DObject::SecondaryRoleOutline:
- return false;
- }
- return true;
-}
-
QColor DefaultStyleEngine::baseColor(ElementType elementType, ObjectVisuals objectVisuals)
{
if (objectVisuals.visualSecondaryRole() == DObject::SecondaryRoleOutline)
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.h b/src/libs/modelinglib/qmt/style/defaultstyleengine.h
index 32940881e3c..67cdf9ed857 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.h
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.h
@@ -54,11 +54,6 @@ private:
ElementType objectType(const DObject *object);
- bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
- DObject::VisualSecondaryRole rhsSecondaryRole,
- DObject::VisualPrimaryRole lhsPrimaryRole,
- DObject::VisualSecondaryRole lhsSecondaryRols);
-
QColor baseColor(ElementType elementType, ObjectVisuals objectVisuals);
QColor lineColor(ElementType elementType, const ObjectVisuals &objectVisuals);
QColor fillColor(ElementType elementType, const ObjectVisuals &objectVisuals);