diff --git a/src/lib/component/view/GraphViewStyle.cpp b/src/lib/component/view/GraphViewStyle.cpp index 320cb90e..d671b6ab 100644 --- a/src/lib/component/view/GraphViewStyle.cpp +++ b/src/lib/component/view/GraphViewStyle.cpp @@ -11,8 +11,8 @@ int GraphViewStyle::s_gridCellSize = 5; int GraphViewStyle::s_gridCellPadding = 10; -std::unordered_map GraphViewStyle::s_charWidths; -std::unordered_map GraphViewStyle::s_charHeights; +std::map GraphViewStyle::s_charWidths; +std::map GraphViewStyle::s_charHeights; std::shared_ptr GraphViewStyle::s_impl; @@ -704,7 +704,7 @@ const GraphViewStyle::NodeColor& GraphViewStyle::getScreenMatchColor(bool focus) float GraphViewStyle::getCharWidth(NodeType::StyleType type) { - std::unordered_map::const_iterator it = s_charWidths.find(type); + std::map::const_iterator it = s_charWidths.find(type); if (it != s_charWidths.end()) { @@ -718,7 +718,7 @@ float GraphViewStyle::getCharWidth(NodeType::StyleType type) float GraphViewStyle::getCharHeight(NodeType::StyleType type) { - std::unordered_map::const_iterator it = s_charHeights.find(type); + std::map::const_iterator it = s_charHeights.find(type); if (it != s_charHeights.end()) { diff --git a/src/lib/component/view/GraphViewStyle.h b/src/lib/component/view/GraphViewStyle.h index 32ecf895..79057ca7 100644 --- a/src/lib/component/view/GraphViewStyle.h +++ b/src/lib/component/view/GraphViewStyle.h @@ -3,7 +3,6 @@ #include #include -#include #include "utility/math/Vector2.h" @@ -150,8 +149,8 @@ private: static float getCharWidth(NodeType::StyleType type); static float getCharHeight(NodeType::StyleType type); - static std::unordered_map s_charWidths; - static std::unordered_map s_charHeights; + static std::map s_charWidths; + static std::map s_charHeights; static std::shared_ptr s_impl; diff --git a/src/lib_gui/qt/element/QtCodeFile.cpp b/src/lib_gui/qt/element/QtCodeFile.cpp index fbe16a95..a9caa831 100644 --- a/src/lib_gui/qt/element/QtCodeFile.cpp +++ b/src/lib_gui/qt/element/QtCodeFile.cpp @@ -65,6 +65,7 @@ QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeNavigator* navigator) // m_minimizeButton->addState(QtIconStateButton::STATE_HOVERED, (ResourcePaths::getGuiPath().str() + "code_view/images/minimize_inactive.png").c_str(), "#5E5D5D"); m_minimizeButton->addState(QtIconStateButton::STATE_HOVERED, (ResourcePaths::getGuiPath().str() + "code_view/images/minimize_inactive.png").c_str(), QColor(0x5E, 0x5D, 0x5D)); m_minimizeButton->addState(QtIconStateButton::STATE_DISABLED, (ResourcePaths::getGuiPath().str() + "code_view/images/minimize_inactive.png").c_str()); + m_minimizeButton->setIconSize(QSize(16, 16)); m_minimizeButton->setObjectName("file_button"); m_minimizeButton->setToolTip("minimize"); titleLayout->addWidget(m_minimizeButton); @@ -74,6 +75,7 @@ QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeNavigator* navigator) // m_snippetButton->addState(QtIconStateButton::STATE_HOVERED, (ResourcePaths::getGuiPath().str() + "code_view/images/snippet_inactive.png").c_str(), "#5E5D5D"); m_snippetButton->addState(QtIconStateButton::STATE_HOVERED, (ResourcePaths::getGuiPath().str() + "code_view/images/snippet_inactive.png").c_str(), QColor(0x5E, 0x5D, 0x5D)); m_snippetButton->addState(QtIconStateButton::STATE_DISABLED, (ResourcePaths::getGuiPath().str() + "code_view/images/snippet_inactive.png").c_str()); + m_snippetButton->setIconSize(QSize(16, 16)); m_snippetButton->setObjectName("file_button"); m_snippetButton->setToolTip("show snippets"); titleLayout->addWidget(m_snippetButton); @@ -83,6 +85,7 @@ QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeNavigator* navigator) // m_maximizeButton->addState(QtIconStateButton::STATE_HOVERED, (ResourcePaths::getGuiPath().str() + "code_view/images/maximize_inactive.png").c_str(), "#5E5D5D"); m_maximizeButton->addState(QtIconStateButton::STATE_HOVERED, (ResourcePaths::getGuiPath().str() + "code_view/images/maximize_inactive.png").c_str(), QColor(0x5E, 0x5D, 0x5D)); m_maximizeButton->addState(QtIconStateButton::STATE_DISABLED, (ResourcePaths::getGuiPath().str() + "code_view/images/maximize_inactive.png").c_str()); + m_maximizeButton->setIconSize(QSize(16, 16)); m_maximizeButton->setObjectName("file_button"); m_maximizeButton->setToolTip("maximize"); titleLayout->addWidget(m_maximizeButton); diff --git a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp index de2e3abf..991d9a14 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp +++ b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp @@ -22,6 +22,8 @@ QtCodeFileTitleButton::QtCodeFileTitleButton(QWidget* parent) setFixedHeight(std::max(fontMetrics().height() * 1.2, 28.0)); setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Fixed); + setIconSize(QSize(16, 16)); + connect(this, &QtCodeFileTitleButton::clicked, this, &QtCodeFileTitleButton::clickedTitle); } diff --git a/src/lib_gui/qt/element/QtDirectoryListBox.cpp b/src/lib_gui/qt/element/QtDirectoryListBox.cpp index 140f23ad..d4ec9d26 100644 --- a/src/lib_gui/qt/element/QtDirectoryListBox.cpp +++ b/src/lib_gui/qt/element/QtDirectoryListBox.cpp @@ -31,6 +31,7 @@ QtListItemWidget::QtListItemWidget(QtDirectoryListBox* list, QListWidgetItem* it m_button = new QtIconButton( (ResourcePaths::getGuiPath().str() + "window/dots.png").c_str(), (ResourcePaths::getGuiPath().str() + "window/dots_hover.png").c_str()); + m_button->setIconSize(QSize(16, 16)); m_button->setObjectName("dotsButton"); layout->addWidget(m_data); @@ -126,6 +127,7 @@ QtDirectoryListBox::QtDirectoryListBox(QWidget *parent, const QString& listName, m_addButton = new QtIconButton( (ResourcePaths::getGuiPath().str() + "window/plus.png").c_str(), (ResourcePaths::getGuiPath().str() + "window/plus_hover.png").c_str()); + m_addButton->setIconSize(QSize(16, 16)); m_addButton->setObjectName("plusButton"); m_addButton->setToolTip("add line"); innerLayout->addWidget(m_addButton); @@ -133,6 +135,7 @@ QtDirectoryListBox::QtDirectoryListBox(QWidget *parent, const QString& listName, m_removeButton = new QtIconButton( (ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(), (ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str()); + m_removeButton->setIconSize(QSize(16, 16)); m_removeButton->setObjectName("minusButton"); m_removeButton->setToolTip("remove line"); innerLayout->addWidget(m_removeButton); @@ -148,6 +151,7 @@ QtDirectoryListBox::QtDirectoryListBox(QWidget *parent, const QString& listName, QPushButton* editButton = new QtIconButton( (ResourcePaths::getGuiPath().str() + "code_view/images/edit.png").c_str(), QString()); + editButton->setIconSize(QSize(16, 16)); editButton->setObjectName("editButton"); editButton->setToolTip("edit plain text"); innerLayout->addWidget(editButton); diff --git a/src/lib_gui/qt/element/QtHelpButton.cpp b/src/lib_gui/qt/element/QtHelpButton.cpp index 62e19f2f..7d8ff3d4 100644 --- a/src/lib_gui/qt/element/QtHelpButton.cpp +++ b/src/lib_gui/qt/element/QtHelpButton.cpp @@ -17,6 +17,7 @@ QtHelpButton::QtHelpButton(const QString& helpTitle, const QString& helpText, QW setMouseTracking(true); setToolTip("help"); + setIconSize(QSize(16, 16)); leaveEvent(nullptr); diff --git a/src/lib_gui/qt/element/QtLocationPicker.cpp b/src/lib_gui/qt/element/QtLocationPicker.cpp index cdce401e..dbfb74a5 100644 --- a/src/lib_gui/qt/element/QtLocationPicker.cpp +++ b/src/lib_gui/qt/element/QtLocationPicker.cpp @@ -30,6 +30,7 @@ QtLocationPicker::QtLocationPicker(QWidget *parent) m_button = new QtIconButton( (ResourcePaths::getGuiPath().str() + "window/dots.png").c_str(), (ResourcePaths::getGuiPath().str() + "window/dots_hover.png").c_str()); + m_button->setIconSize(QSize(16, 16)); m_button->setObjectName("dotsButton"); m_button->setToolTip("pick file"); connect(m_button, &QPushButton::clicked, this, &QtLocationPicker::handleButtonPress); diff --git a/src/lib_gui/qt/element/QtRefreshBar.cpp b/src/lib_gui/qt/element/QtRefreshBar.cpp index e583689d..e061e845 100644 --- a/src/lib_gui/qt/element/QtRefreshBar.cpp +++ b/src/lib_gui/qt/element/QtRefreshBar.cpp @@ -49,4 +49,8 @@ void QtRefreshBar::refreshStyle() ResourcePaths::getGuiPath().str() + "refresh_view/images/refresh.png", "search/button" )); + + int iconSize = int(height / 4) * 2 + 2; + + m_refreshButton->setIconSize(QSize(iconSize, iconSize)); } diff --git a/src/lib_gui/qt/element/QtSearchBar.cpp b/src/lib_gui/qt/element/QtSearchBar.cpp index 70b92578..751add0b 100644 --- a/src/lib_gui/qt/element/QtSearchBar.cpp +++ b/src/lib_gui/qt/element/QtSearchBar.cpp @@ -111,6 +111,11 @@ void QtSearchBar::refreshStyle() "search/button" )); + int iconSize = int((m_searchBox->height() + 5) / 4) * 2 + 2; + + m_searchButton->setIconSize(QSize(iconSize, iconSize)); + m_homeButton->setIconSize(QSize(iconSize, iconSize)); + m_searchBox->refreshStyle(); } diff --git a/src/lib_gui/qt/element/QtUndoRedo.cpp b/src/lib_gui/qt/element/QtUndoRedo.cpp index d10826f1..9bd4ff62 100644 --- a/src/lib_gui/qt/element/QtUndoRedo.cpp +++ b/src/lib_gui/qt/element/QtUndoRedo.cpp @@ -148,4 +148,10 @@ void QtUndoRedo::refreshStyle() ResourcePaths::getGuiPath().str() + "undoredo_view/images/history.png", "search/button" )); + + int iconSize = int(height / 4) * 2 + 2; + + m_undoButton->setIconSize(QSize(iconSize, iconSize)); + m_redoButton->setIconSize(QSize(iconSize, iconSize)); + m_historyButton->setIconSize(QSize(iconSize, iconSize)); } diff --git a/src/lib_gui/qt/view/QtBookmarkView.cpp b/src/lib_gui/qt/view/QtBookmarkView.cpp index 518a8e07..788a7d16 100644 --- a/src/lib_gui/qt/view/QtBookmarkView.cpp +++ b/src/lib_gui/qt/view/QtBookmarkView.cpp @@ -269,4 +269,9 @@ void QtBookmarkView::refreshStyle() ResourcePaths::getGuiPath().str() + "bookmark_view/images/bookmark_list_icon.png", "search/button" )); + + int iconSize = int(height / 4) * 2 + 2; + + m_createBookmarkButton->setIconSize(QSize(iconSize, iconSize)); + m_showBookmarksButton->setIconSize(QSize(iconSize, iconSize)); } diff --git a/src/lib_gui/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp index 5b53b01b..ebc302c6 100644 --- a/src/lib_gui/qt/view/QtGraphView.cpp +++ b/src/lib_gui/qt/view/QtGraphView.cpp @@ -178,6 +178,9 @@ void QtGraphView::refreshView() "search/button" )); + m_expandButton->setIconSize(QSize(16, 16)); + m_collapseButton->setIconSize(QSize(16, 16)); + updateTrailButtons(); }); } @@ -764,6 +767,9 @@ void QtGraphView::updateTrailButtons() ResourcePaths::getGuiPath().str() + "graph_view/images/" + forwardImagePath, "search/button" )); + + m_backwardTrailButton->setIconSize(QSize(16, 16)); + m_forwardTrailButton->setIconSize(QSize(16, 16)); } void QtGraphView::switchToNewGraphData()