ui: Improved contrasts in color schemes

* fixed edge routed wrong issue in graph legend
* fixed Alt + Ctrl/Cmd + R refreshes UI
This commit is contained in:
Eberhard Graether
2018-07-27 14:45:25 +02:00
parent 713a8eec50
commit ea0c249ad9
5 changed files with 19 additions and 19 deletions
+1 -1
View File
@@ -513,7 +513,7 @@
</macro_use>
<aggregation>
<normal>#5D5D5D</normal>
<normal>#666666</normal>
<focus>#6D6D6D</focus>
</aggregation>
</edge>
+4 -4
View File
@@ -301,15 +301,15 @@
<global_variable>
<fill>
<normal>#7BB5D4</normal>
<focus>#42A1D4</focus>
<normal>#81C1E3</normal>
<focus>#72B3D6</focus>
</fill>
<border>
<normal>transparent</normal>
<focus>#3C3C3C</focus>
</border>
<hatching>
<normal>#B3D4E5</normal>
<normal>#C9E3F0</normal>
</hatching>
</global_variable>
<field>
@@ -460,7 +460,7 @@
</call>
<use>
<normal>#3190BA</normal>
<normal>#4B9FC4</normal>
</use>
<template_argument>
+1 -1
View File
@@ -463,7 +463,7 @@
</call>
<use>
<normal>#2A6484</normal>
<normal>#2D6A8C</normal>
</use>
<template_argument>
@@ -2314,8 +2314,8 @@ void GraphController::createLegendGraph()
Node* base = addNode(NodeType::NODE_CLASS, L"Base Class", Vec2i(x + 220, y + 50));
Node* main = addNode(NodeType::NODE_CLASS, L"Class", Vec2i(x + 200, y + 130));
Node* derived = addNode(NodeType::NODE_CLASS, L"Derived Class", Vec2i(x + 210, y + 380));
Node* user = addNode(NodeType::NODE_TYPE, L"Referencing Type", Vec2i(x, y + 220));
Node* usee = addNode(NodeType::NODE_TYPE, L"Referenced Type", Vec2i(x + 400, y + 220));
Node* user = addNode(NodeType::NODE_TYPE, L"Referencing Type", Vec2i(x - 10, y + 220));
Node* usee = addNode(NodeType::NODE_TYPE, L"Referenced Type", Vec2i(x + 410, y + 220));
addEdge(Edge::EDGE_INHERITANCE, main, base);
addEdge(Edge::EDGE_INHERITANCE, derived, main);
@@ -2351,9 +2351,9 @@ void GraphController::createLegendGraph()
Node* func = addNode(NodeType::NODE_FUNCTION, L"function", Vec2i(x + 220, y));
Node* caller = addNode(NodeType::NODE_FUNCTION, L"calling function", Vec2i(x, y));
Node* var = addNode(NodeType::NODE_GLOBAL_VARIABLE, L"accessed variable", Vec2i(x + 400, y - 50));
Node* called = addNode(NodeType::NODE_FUNCTION, L"called function", Vec2i(x + 400, y - 10));
Node* type = addNode(NodeType::NODE_TYPE, L"Referenced Type", Vec2i(x + 400, y + 30));
Node* var = addNode(NodeType::NODE_GLOBAL_VARIABLE, L"accessed variable", Vec2i(x + 410, y - 50));
Node* called = addNode(NodeType::NODE_FUNCTION, L"called function", Vec2i(x + 410, y - 10));
Node* type = addNode(NodeType::NODE_TYPE, L"Referenced Type", Vec2i(x + 410, y + 30));
addEdge(Edge::EDGE_CALL, func, called);
addEdge(Edge::EDGE_CALL, caller, func);
+8 -8
View File
@@ -408,6 +408,13 @@ void QtMainWindow::keyPressEvent(QKeyEvent* event)
emit showScreenSearch();
break;
case Qt::Key_R:
if (event->modifiers() & (Qt::ControlModifier | Qt::AltModifier))
{
MessageRefresh().refreshUiOnly().dispatch();
}
break;
case Qt::Key_Space:
PRINT_TRACES();
break;
@@ -653,14 +660,7 @@ void QtMainWindow::closeWindow()
void QtMainWindow::refresh()
{
if (Qt::KeyboardModifier::AltModifier & QApplication::keyboardModifiers())
{
MessageRefresh().refreshUiOnly().dispatch();
}
else
{
MessageRefresh().dispatch();
}
MessageRefresh().dispatch();
}
void QtMainWindow::forceRefresh()