mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
add some comments
reformat
This commit is contained in:
parent
b720450f86
commit
7879fef3a0
4 changed files with 20 additions and 4 deletions
|
@ -212,7 +212,8 @@ void Theme::actuallyUpdate(double hue, double multiplier)
|
||||||
this->messages.backgrounds.highlighted =
|
this->messages.backgrounds.highlighted =
|
||||||
blendColors(themeColor, this->messages.backgrounds.regular, 0.8);
|
blendColors(themeColor, this->messages.backgrounds.regular, 0.8);
|
||||||
} else {
|
} else {
|
||||||
this->messages.backgrounds.highlighted = QColor(getSettings()->highlightColor);
|
this->messages.backgrounds.highlighted =
|
||||||
|
QColor(getSettings()->highlightColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
this->messages.backgrounds.subscription =
|
this->messages.backgrounds.subscription =
|
||||||
|
|
|
@ -32,9 +32,17 @@ public:
|
||||||
static const int uiScaleMax;
|
static const int uiScaleMax;
|
||||||
|
|
||||||
void showSettingsDialog();
|
void showSettingsDialog();
|
||||||
|
|
||||||
|
// Show the account selector widget at point
|
||||||
void showAccountSelectPopup(QPoint point);
|
void showAccountSelectPopup(QPoint point);
|
||||||
|
|
||||||
|
// Tell a channel (or all channels if channel is nullptr) to redo their
|
||||||
|
// layout
|
||||||
void layoutChannelViews(Channel *channel = nullptr);
|
void layoutChannelViews(Channel *channel = nullptr);
|
||||||
|
|
||||||
|
// Force all channel views to redo their layout
|
||||||
|
// This is called, for example, when the emote scale or timestamp format has
|
||||||
|
// changed
|
||||||
void forceLayoutChannelViews();
|
void forceLayoutChannelViews();
|
||||||
void repaintVisibleChatWidgets(Channel *channel = nullptr);
|
void repaintVisibleChatWidgets(Channel *channel = nullptr);
|
||||||
void repaintGifEmotes();
|
void repaintGifEmotes();
|
||||||
|
@ -57,10 +65,16 @@ public:
|
||||||
void updateWordTypeMask();
|
void updateWordTypeMask();
|
||||||
|
|
||||||
pajlada::Signals::NoArgSignal repaintGifs;
|
pajlada::Signals::NoArgSignal repaintGifs;
|
||||||
|
|
||||||
|
// This signal fires whenever views rendering a channel, or all views if the
|
||||||
|
// channel is a nullptr, need to redo their layout
|
||||||
pajlada::Signals::Signal<Channel *> layout;
|
pajlada::Signals::Signal<Channel *> layout;
|
||||||
|
|
||||||
pajlada::Signals::NoArgSignal wordFlagsChanged;
|
pajlada::Signals::NoArgSignal wordFlagsChanged;
|
||||||
|
|
||||||
|
// Sends an alert to the main window
|
||||||
|
// It reads the `longAlert` setting to decide whether the alert will expire
|
||||||
|
// or not
|
||||||
void sendAlert();
|
void sendAlert();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -314,7 +314,9 @@ void Window::onAccountSelected()
|
||||||
auto user = getApp()->accounts->twitch.getCurrent();
|
auto user = getApp()->accounts->twitch.getCurrent();
|
||||||
|
|
||||||
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING
|
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING
|
||||||
auto windowTitleEnd = QString(" - Chatterino Nightly " CHATTERINO_VERSION " (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")");
|
auto windowTitleEnd =
|
||||||
|
QString(" - Chatterino Nightly " CHATTERINO_VERSION
|
||||||
|
" (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")");
|
||||||
#else
|
#else
|
||||||
auto windowTitleEnd = QString(" - Chatterino Beta " CHATTERINO_VERSION);
|
auto windowTitleEnd = QString(" - Chatterino Beta " CHATTERINO_VERSION);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1346,8 +1346,7 @@ void ChannelView::showUserInfoPopup(const QString &userName)
|
||||||
auto *userPopup = new UserInfoPopup;
|
auto *userPopup = new UserInfoPopup;
|
||||||
userPopup->setData(userName, this->channel_);
|
userPopup->setData(userName, this->channel_);
|
||||||
userPopup->setActionOnFocusLoss(BaseWindow::Delete);
|
userPopup->setActionOnFocusLoss(BaseWindow::Delete);
|
||||||
QPoint offset(int(150 * this->getScale()),
|
QPoint offset(int(150 * this->getScale()), int(70 * this->getScale()));
|
||||||
int(70 * this->getScale()));
|
|
||||||
userPopup->move(QCursor::pos() - offset);
|
userPopup->move(QCursor::pos() - offset);
|
||||||
userPopup->show();
|
userPopup->show();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue