ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: new colors and other ui improvements

Browse Source 
* smoothing for edge lines
* fixed activation of token not working when multiple tokens active
* changed inheritance arrow
* thicker width for edges on focus
This commit is contained in:
Eberhard Graether
2015-05-24 14:47:52 +02:00
parent bd5de1d271
commit 23da81136f
9 changed files with 57 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/view/GraphViewStyle.cpp
+21 -9
View File
@@ -265,7 +265,6 @@ GraphViewStyle::NodeStyle GraphViewStyle::getStyleForNodeType(
case Node::NODE_ENUM:
case Node::NODE_TYPEDEF:
case Node::NODE_TEMPLATE_PARAMETER_TYPE:
case Node::NODE_FILE:
if (isActive)
{
style.fontBold = true;
@@ -295,6 +294,17 @@ GraphViewStyle::NodeStyle GraphViewStyle::getStyleForNodeType(
}
break;
case Node::NODE_FILE:
if (isActive)
{
style.fontBold = true;
}
style.cornerRadius = 6;
style.textOffset.x = 8;
style.textOffset.y = 8;
break;
case Node::NODE_UNDEFINED_FUNCTION:
case Node::NODE_UNDEFINED_VARIABLE:
style.undefinedPattern = true;
@@ -361,7 +371,7 @@ GraphViewStyle::EdgeStyle GraphViewStyle::getStyleForEdgeType(Edge::EdgeType typ
{
EdgeStyle style;
style.width = isActive ? 2 : 1;
style.width = isActive ? 3 : 1;
style.zValue = isActive ? 5 : 1;
style.arrowLength = 5;
@@ -386,33 +396,35 @@ GraphViewStyle::EdgeStyle GraphViewStyle::getStyleForEdgeType(Edge::EdgeType typ
break;
case Edge::EDGE_CALL:
style.color = "#F1C100";
style.color = "#F4BC3D";
style.originOffset.y = 1;
style.targetOffset.y = -1;
style.verticalOffset = 4;
break;
case Edge::EDGE_USAGE:
style.color = "#62B29D";
style.color = "#3190BA";
style.originOffset.y = 3;
style.targetOffset.y = -3;
style.verticalOffset = 6;
break;
case Edge::EDGE_INHERITANCE:
style.arrowLength = 15;
style.arrowWidth = 20;
style.arrowLength = 20;
style.arrowWidth = 14;
style.arrowClosed = true;
style.targetOffset.x = 29;
style.targetOffset.x = 34;
style.color = "#878787";
break;
case Edge::EDGE_OVERRIDE:
style.color = "#CC5E89";
break;
case Edge::EDGE_INCLUDE:
style.color = "#87BA50";
style.color = "#5DA399";
break;
case Edge::EDGE_TEMPLATE_PARAMETER_OF:
case Edge::EDGE_TEMPLATE_ARGUMENT_OF:
case Edge::EDGE_TEMPLATE_DEFAULT_ARGUMENT_OF:
case Edge::EDGE_TEMPLATE_SPECIALIZATION_OF:
style.color = "#DD0000";
style.color = "#C1305D";
break;
default:
style.color = "#878787";
src/lib/settings/ApplicationSettings.cpp
-30
View File
@@ -56,36 +56,6 @@ void ApplicationSettings::setCodeFontSize(int codeFontSize)
setValue<int>("code/FontSize", codeFontSize);
}
Colori ApplicationSettings::getCodeLinkColor() const
{
return Colori::fromString(getValue<std::string>("code/LinkColor", Colori(255, 255, 0, 100).toString()));
}
void ApplicationSettings::setCodeLinkColor(Colori color)
{
setValue<std::string>("code/LinkColor", color.toString());
}
Colori ApplicationSettings::getCodeScopeColor() const
{
return Colori::fromString(getValue<std::string>("code/ScopeColor", Colori(255, 255, 0, 100).toString()));
}
void ApplicationSettings::setCodeScopeColor(Colori color)
{
setValue<std::string>("code/ScopeColor", color.toString());
}
Colori ApplicationSettings::getCodeActiveLinkColor() const
{
return Colori::fromString(getValue<std::string>("code/ActiveLinkColor", Colori(0, 255, 0, 100).toString()));
}
void ApplicationSettings::setCodeActiveLinkColor(Colori color)
{
setValue<std::string>("code/ActiveLinkColor", color.toString());
}
int ApplicationSettings::getCodeSnippetSnapRange() const
{
return getValue<int>("code/snippet/snap_range", 4);
src/lib/settings/ApplicationSettings.h
-9
View File
@@ -29,15 +29,6 @@ public:
int getCodeFontSize() const;
void setCodeFontSize(int codeFontSize);
Colori getCodeLinkColor() const;
void setCodeLinkColor(Colori color);
Colori getCodeScopeColor() const;
void setCodeScopeColor(Colori color);
Colori getCodeActiveLinkColor() const;
void setCodeActiveLinkColor(Colori color);
int getCodeSnippetSnapRange() const;
void setCodeSnippetSnapRange(int range);