noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

added setting for compact emotes Fixed #821

Browse source
This commit is contained in:
fourtf 2018-10-29 21:46:43 +01:00
parent dd8e8ad960
commit d500ab59ea
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/messages/layouts/MessageLayoutContainer.cpp
View file

@ -103,6 +103,7 @@ void MessageLayoutContainer::_addElement(MessageLayoutElement *element,
// compact emote offset
bool isCompactEmote =
getSettings()->compactEmotes &&
!this->flags_.has(MessageFlag::DisableCompactEmotes) &&
element->getCreator().getFlags().has(MessageElementFlag::EmoteImages);
@ -148,6 +149,7 @@ void MessageLayoutContainer::breakLine()
MessageLayoutElement *element = this->elements_.at(i).get();
bool isCompactEmote =
getSettings()->compactEmotes &&
!this->flags_.has(MessageFlag::DisableCompactEmotes) &&
element->getCreator().getFlags().has(
MessageElementFlag::EmoteImages);

2
src/singletons/Settings.hpp
View file

@ -42,6 +42,8 @@ public:
false};
BoolSetting separateMessages = {"/appearance/messages/separateMessages",
false};
BoolSetting compactEmotes = {"/appearance/messages/compactEmotes", true};
// BoolSetting collapseLongMessages =
// {"/appearance/messages/collapseLongMessages", false};
IntSetting collpseMessagesMinLines = {

17
src/widgets/settingspages/LookPage.cpp
View file

@ -83,9 +83,12 @@ void LookPage::addInterfaceTab(LayoutCreator<QVBoxLayout> layout)
QObject::connect(theme, &QComboBox::currentTextChanged,
[w](const QString &themeName) {
if (themeName == "Custom") {
if (themeName == "Custom")
{
w->show();
} else {
}
else
{
w->hide();
}
getApp()->windows->forceLayoutChannelViews();
@ -97,9 +100,12 @@ void LookPage::addInterfaceTab(LayoutCreator<QVBoxLayout> layout)
{
w->setButtonSymbols(QDoubleSpinBox::NoButtons);
if (getApp()->themes->themeName.getValue() != "Custom") {
if (getApp()->themes->themeName.getValue() != "Custom")
{
w->hide();
} else {
}
else
{
w->show();
}
w->setRange(-1.0, 1.0);
@ -181,6 +187,9 @@ void LookPage::addMessageTab(LayoutCreator<QVBoxLayout> layout)
layout.append(this->createCheckBox(
"Alternate background", getSettings()->alternateMessageBackground));
layout.append(
this->createCheckBox("Compact emotes", getSettings()->compactEmotes));
layout.append(this->createCheckBox("Grey out historic messages",
getSettings()->greyOutHistoricMessages));
// --

7
src/widgets/settingspages/SettingsPage.cpp
View file

@ -1,5 +1,8 @@
#include "SettingsPage.hpp"
#include "Application.hpp"
#include "singletons/WindowManager.hpp"
#include <QDebug>
#include <QPainter>
@ -51,8 +54,8 @@ QCheckBox *SettingsPage::createCheckBox(
// update setting on toggle
QObject::connect(checkbox, &QCheckBox::toggled, this,
[&setting](bool state) {
qDebug() << "update checkbox value";
setting = state; //
setting = state;
getApp()->windows->forceLayoutChannelViews();
});
return checkbox;