diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml index e04f7287..ef743d4c 100644 --- a/bin/app/data/color_schemes/bad_rainbow.xml +++ b/bin/app/data/color_schemes/bad_rainbow.xml @@ -513,7 +513,7 @@ - #5D5D5D + #666666 #6D6D6D diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml index 3f29a099..ec06159a 100644 --- a/bin/app/data/color_schemes/bright.xml +++ b/bin/app/data/color_schemes/bright.xml @@ -301,15 +301,15 @@ - #7BB5D4 - #42A1D4 + #81C1E3 + #72B3D6 transparent #3C3C3C - #B3D4E5 + #C9E3F0 @@ -460,7 +460,7 @@ - #3190BA + #4B9FC4 diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml index ca731620..c3590db2 100644 --- a/bin/app/data/color_schemes/dark.xml +++ b/bin/app/data/color_schemes/dark.xml @@ -463,7 +463,7 @@ - #2A6484 + #2D6A8C diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index 467da262..1bac0e19 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -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); diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp index 868bedc1..c47e7349 100644 --- a/src/lib_gui/qt/window/QtMainWindow.cpp +++ b/src/lib_gui/qt/window/QtMainWindow.cpp @@ -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()