chatterino2
Code Issues

reformat

Browse Source
This commit is contained in:
Rasmus Karlsson
2019-08-11 21:08:18 +02:00
parent 391d75f208
commit cd5972522b
5 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/splits/Split.cpp
+12 -11
View File
@@ -175,18 +175,19 @@ Split::Split(QWidget *parent)
this->setSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::MinimumExpanding);
this->managedConnect(modifierStatusChanged,
[this](Qt::KeyboardModifiers status) {
if ((status == showSplitOverlayModifiers /*|| status == showAddSplitRegions*/) &&
this->managedConnect(modifierStatusChanged, [this](Qt::KeyboardModifiers
status) {
if ((status ==
showSplitOverlayModifiers /*|| status == showAddSplitRegions*/) &&
this->isMouseOver_)
{
this->overlay_->show();
}
else
{
this->overlay_->hide();
}
});
{
this->overlay_->show();
}
else
{
this->overlay_->hide();
}
});
this->input_->ui_.textEdit->focused.connect(
[this] { this->focused.invoke(); });
src/widgets/splits/SplitHeader.cpp
+16 -19
View File
@@ -176,9 +176,7 @@ void SplitHeader::initializeLayout()
switch (button)
{
case Qt::LeftButton:
if (getApp()
->moderationActions->items
.empty())
if (getApp()->moderationActions->items.empty())
{
getApp()->windows->showSettingsDialog(
SettingsDialogPreference::
@@ -222,19 +220,19 @@ void SplitHeader::initializeLayout()
});
// update moderation button when items changed
this->managedConnect(
getApp()->moderationActions->items.delayedItemsChanged, [this] {
if (getApp()->moderationActions->items.empty())
{
if (this->split_->getModerationMode())
this->split_->setModerationMode(true);
}
else
{
if (this->split_->getModerationMode())
this->split_->setModerationMode(true);
}
});
this->managedConnect(getApp()->moderationActions->items.delayedItemsChanged,
[this] {
if (getApp()->moderationActions->items.empty())
{
if (this->split_->getModerationMode())
this->split_->setModerationMode(true);
}
else
{
if (this->split_->getModerationMode())
this->split_->setModerationMode(true);
}
});
layout->setMargin(0);
layout->setSpacing(0);
@@ -507,9 +505,8 @@ void SplitHeader::updateChannelText()
void SplitHeader::updateModerationModeIcon()
{
auto moderationMode =
this->split_->getModerationMode() &&
!getApp()->moderationActions->items.empty();
auto moderationMode = this->split_->getModerationMode() &&
!getApp()->moderationActions->items.empty();
this->moderationButton_->setPixmap(
moderationMode ? getApp()->resources->buttons.modModeEnabled