Merge remote-tracking branch 'origin/master'

# Conflicts: # src/external/framelesshelper/examples/QMainWindow/TitleBar.ui
2020-11-05 17:23:56 +03:00
parent 07bc9bc97a e4f821528c
commit 53ddbd66a1
1 changed files with 2 additions and 1 deletions
--- a/src/noggit/ui/main_window.cpp
+++ b/src/noggit/ui/main_window.cpp
@@ -66,7 +66,8 @@ namespace noggit
      titleBarWidget.horizontalLayout->insertWidget(1, _menuBar);
      titleBarWidget.horizontalLayout->insertWidget(1, new QLabel(title.str().c_str(), this));
      _menuBar->setMaximumHeight(20);
-
+      
+      titleBarWidget.iconButton->setAccessibleName("titlebar_icon");
      titleBarWidget.minimizeButton->setIcon(font_awesome_icon(font_awesome::windowminimize));
      titleBarWidget.minimizeButton->setIconSize(QSize(14, 14));
      titleBarWidget.minimizeButton->setAccessibleName("titlebar_minimize");