Merge branch 'master' into apa-notification-on-live

src/widgets/dialogs/EmotePopup.cpp

@@ -29,11 +29,17 @@ namespace {
         builder->flags.set(MessageFlag::Centered);
         builder->flags.set(MessageFlag::DisableCompactEmotes);
 
-        for (const auto &emote : map) {
-            builder
-                .emplace<EmoteElement>(emote.second,
-                                       MessageElementFlag::AlwaysShow)
-                ->setLink(Link(Link::InsertText, emote.first.string));
+        if (!map.empty()) {
+            for (const auto &emote : map) {
+                builder
+                    .emplace<EmoteElement>(emote.second,
+                                           MessageElementFlag::AlwaysShow)
+                    ->setLink(Link(Link::InsertText, emote.first.string));
+            }
+        } else {
+            builder.emplace<TextElement>("no emotes available",
+                                         MessageElementFlag::Text,
+                                         MessageColor::System);
         }
 
         return builder.release();
@@ -106,7 +112,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
 {
     BenchmarkGuard guard("loadChannel");
 
-    this->setWindowTitle("Emotes from " + _channel->getName());
+    this->setWindowTitle("Emotes in #" + _channel->getName());
 
     auto twitchChannel = dynamic_cast<TwitchChannel *>(_channel.get());
     if (twitchChannel == nullptr) return;
@@ -139,6 +145,16 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
     this->globalEmotesView_->setChannel(globalChannel);
     this->subEmotesView_->setChannel(subChannel);
     this->channelEmotesView_->setChannel(channelChannel);
+
+    if (subChannel->getMessageSnapshot().getLength() == 0) {
+        MessageBuilder builder;
+        builder->flags.set(MessageFlag::Centered);
+        builder->flags.set(MessageFlag::DisableCompactEmotes);
+        builder.emplace<TextElement>("no subscription emotes available",
+                                     MessageElementFlag::Text,
+                                     MessageColor::System);
+        subChannel->addMessage(builder.release());
+    }
 }
 
 void EmotePopup::loadEmojis()

src/widgets/dialogs/SettingsDialog.cpp

@@ -35,6 +35,7 @@ SettingsDialog::SettingsDialog()
     this->scaleChangedEvent(this->getScale());
 
     this->overrideBackgroundColor_ = QColor("#282828");
+    this->themeChangedEvent();
 }
 
 void SettingsDialog::initUi()
@@ -187,7 +188,7 @@ void SettingsDialog::themeChangedEvent()
     BaseWindow::themeChangedEvent();
 
     QPalette palette;
-    palette.setColor(QPalette::Background, QColor("#444"));
+    palette.setColor(QPalette::Background, QColor("#222"));
     this->setPalette(palette);
 }