natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	resources/resources.qrc
This commit is contained in:
sshumakov3
2020-11-16 00:34:47 +03:00
parent 48b209d10e 3226ff2ae1
commit 684980c6da
4 changed files with 243 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/Font Awesome 5 Pro-Regular-400.otf Normal file
View File

Binary file not shown.

7
src/noggit/ui/FramelessWindow.hpp
View File

@@ -25,15 +25,16 @@ namespace noggit::ui
titleBarWidget->windowTitle->setText(window->windowTitle());
titleBarWidget->iconButton->setAccessibleName("titlebar_icon");
titleBarWidget->iconButton->setMinimumWidth(32);
titleBarWidget->minimizeButton->setIcon(font_awesome_icon(font_awesome::windowminimize));
titleBarWidget->minimizeButton->setIconSize(QSize(14, 14));
titleBarWidget->minimizeButton->setIconSize(QSize(16, 16));
titleBarWidget->minimizeButton->setAccessibleName("titlebar_minimize");
titleBarWidget->maximizeButton->setIcon(font_awesome_icon(font_awesome::windowrestore));
titleBarWidget->maximizeButton->setIcon(font_awesome_icon(font_awesome::windowmaximize));
titleBarWidget->maximizeButton->setAccessibleName("titlebar_maximize");
titleBarWidget->maximizeButton->setIconSize(QSize(14, 14));
titleBarWidget->closeButton->setIcon(font_awesome_icon(font_awesome::times));
titleBarWidget->closeButton->setAccessibleName("titlebar_close");
titleBarWidget->closeButton->setIconSize(QSize(16, 16));
titleBarWidget->closeButton->setIconSize(QSize(18, 18));
QObject::connect(titleBarWidget->closeButton,
&QPushButton::clicked,

22
src/noggit/ui/TitleBar.ui
View File

@@ -31,10 +31,16 @@
</property>
<item>
<widget class="QLabel" name="iconButton">
<property name="minimumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>26</width>
<height>26</height>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="styleSheet">
@@ -109,8 +115,8 @@
</property>
<property name="iconSize">
<size>
<width>45</width>
<height>30</height>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>
@@ -151,8 +157,8 @@
</property>
<property name="iconSize">
<size>
<width>45</width>
<height>30</height>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>
@@ -192,8 +198,8 @@
</property>
<property name="iconSize">
<size>
<width>45</width>
<height>30</height>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>

2
src/noggit/ui/texture_palette_small.cpp
View File

@@ -107,7 +107,7 @@ namespace noggit
connect(_add_button, &QAbstractButton::clicked, this, &texture_palette_small::addTexture);
_remove_button = new QPushButton(this);
_remove_button->setIcon(font_awesome_icon(font_awesome::timescircle));
_remove_button->setIcon(font_awesome_icon(font_awesome::times));
button_layout->addWidget(_remove_button);
connect(_remove_button, &QAbstractButton::clicked, this, &texture_palette_small::removeSelectedTexture);