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

ui: switched fonts to FiraSans

Browse Source
This commit is contained in:
Eberhard Graether
2016-02-02 13:59:14 +01:00
parent 3cbafa6456
commit e7224e0c46
10 changed files with 149 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/view/GraphViewStyle.cpp
+5 -5
View File
@@ -173,12 +173,12 @@ std::string GraphViewStyle::getFontNameForNodeType(Node::NodeType type)
std::string GraphViewStyle::getFontNameOfAccessNode()
{
return "Myriad Pro";
return "Fira Sans";
}
std::string GraphViewStyle::getFontNameOfExpandToggleNode()
{
return "Myriad Pro";
return "Fira Sans";
}
GraphViewStyle::NodeMargins GraphViewStyle::getMarginsForNodeType(Node::NodeType type, bool hasChildren)
@@ -262,13 +262,13 @@ GraphViewStyle::NodeMargins GraphViewStyle::getMarginsOfAccessNode(TokenComponen
margins.minWidth = 56;
break;
case TokenComponentAccess::ACCESS_PROTECTED:
margins.minWidth = 80;
margins.minWidth = 72;
break;
case TokenComponentAccess::ACCESS_PRIVATE:
margins.minWidth = 64;
margins.minWidth = 58;
break;
case TokenComponentAccess::ACCESS_TEMPLATE:
margins.minWidth = 110;
margins.minWidth = 103;
break;
}
src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void QtGraphNodeAccess::updateStyle()
if (m_accessIcon)
{
m_text->setPos(style.textOffset.x + m_accessIconSize + 3, style.textOffset.y + m_accessIconSize + 2 - style.fontSize);
m_text->setPos(style.textOffset.x + m_accessIconSize + 3, style.textOffset.y + m_accessIconSize - style.fontSize);
m_accessIcon->setPos(style.textOffset.x, style.textOffset.y);
m_accessIcon->setPixmap(utility::colorizePixmap(m_accessIcon->pixmap(), style.color.icon.c_str()));
src/lib_gui/qt/window/QtMainWindow.cpp
+1 -1
View File
@@ -120,7 +120,7 @@ QtMainWindow::QtMainWindow()
app->installEventFilter(new MouseReleaseFilter(this));
app->installEventFilter(new MouseWheelFilter(this));
app->setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath() + "tooltip.css").c_str());
app->setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath() + "main.css").c_str());
m_recentProjectAction = new QAction*[ApplicationSettings::MaximalAmountOfRecentProjects];