fix: replace defines with constexpr/const and use more absolute paths for includes (#5527)
bye bye nuuls
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include "ClosedSplits.hpp"
|
||||
#include "widgets/splits/ClosedSplits.hpp"
|
||||
|
||||
namespace chatterino {
|
||||
|
||||
|
||||
@@ -343,29 +343,30 @@ Split::Split(QWidget *parent)
|
||||
this->refreshModerationMode();
|
||||
});
|
||||
|
||||
this->signalHolder_.managedConnect(
|
||||
modifierStatusChanged, [this](Qt::KeyboardModifiers status) {
|
||||
if ((status ==
|
||||
showSplitOverlayModifiers /*|| status == showAddSplitRegions*/) &&
|
||||
this->isMouseOver_)
|
||||
{
|
||||
this->overlay_->show();
|
||||
}
|
||||
else
|
||||
{
|
||||
this->overlay_->hide();
|
||||
}
|
||||
this->signalHolder_.managedConnect(modifierStatusChanged, [this](
|
||||
Qt::KeyboardModifiers
|
||||
status) {
|
||||
if ((status ==
|
||||
SHOW_SPLIT_OVERLAY_MODIFIERS /*|| status == showAddSplitRegions*/) &&
|
||||
this->isMouseOver_)
|
||||
{
|
||||
this->overlay_->show();
|
||||
}
|
||||
else
|
||||
{
|
||||
this->overlay_->hide();
|
||||
}
|
||||
|
||||
if (getSettings()->pauseChatModifier.getEnum() != Qt::NoModifier &&
|
||||
status == getSettings()->pauseChatModifier.getEnum())
|
||||
{
|
||||
this->view_->pause(PauseReason::KeyboardModifier);
|
||||
}
|
||||
else
|
||||
{
|
||||
this->view_->unpause(PauseReason::KeyboardModifier);
|
||||
}
|
||||
});
|
||||
if (getSettings()->pauseChatModifier.getEnum() != Qt::NoModifier &&
|
||||
status == getSettings()->pauseChatModifier.getEnum())
|
||||
{
|
||||
this->view_->pause(PauseReason::KeyboardModifier);
|
||||
}
|
||||
else
|
||||
{
|
||||
this->view_->unpause(PauseReason::KeyboardModifier);
|
||||
}
|
||||
});
|
||||
|
||||
this->signalHolder_.managedConnect(this->input_->ui_.textEdit->focused,
|
||||
[this] {
|
||||
@@ -1019,7 +1020,7 @@ void Split::enterEvent(QEvent * /*event*/)
|
||||
this->handleModifiers(QGuiApplication::queryKeyboardModifiers());
|
||||
|
||||
if (modifierStatus ==
|
||||
showSplitOverlayModifiers /*|| modifierStatus == showAddSplitRegions*/)
|
||||
SHOW_SPLIT_OVERLAY_MODIFIERS /*|| modifierStatus == showAddSplitRegions*/)
|
||||
{
|
||||
this->overlay_->show();
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ SplitContainer::SplitContainer(Notebook *parent)
|
||||
Split::modifierStatusChanged, [this](auto modifiers) {
|
||||
this->layout();
|
||||
|
||||
if (modifiers == showResizeHandlesModifiers)
|
||||
if (modifiers == SHOW_RESIZE_HANDLES_MODIFIERS)
|
||||
{
|
||||
for (auto &handle : this->resizeHandles_)
|
||||
{
|
||||
@@ -57,7 +57,7 @@ SplitContainer::SplitContainer(Notebook *parent)
|
||||
}
|
||||
}
|
||||
|
||||
if (modifiers == showSplitOverlayModifiers)
|
||||
if (modifiers == SHOW_SPLIT_OVERLAY_MODIFIERS)
|
||||
{
|
||||
this->setCursor(Qt::PointingHandCursor);
|
||||
}
|
||||
@@ -496,7 +496,7 @@ void SplitContainer::layout()
|
||||
std::vector<ResizeRect> resizeRects;
|
||||
|
||||
const bool addSpacing =
|
||||
Split::modifierStatus == showAddSplitRegions || this->isDragging_;
|
||||
Split::modifierStatus == SHOW_ADD_SPLIT_REGIONS || this->isDragging_;
|
||||
this->baseNode_.layout(addSpacing, this->scale(), dropRects, resizeRects);
|
||||
|
||||
this->dropRects_ = dropRects;
|
||||
@@ -559,7 +559,7 @@ void SplitContainer::layout()
|
||||
handle->setVertical(resizeRect.vertical);
|
||||
handle->node = resizeRect.node;
|
||||
|
||||
if (Split::modifierStatus == showResizeHandlesModifiers)
|
||||
if (Split::modifierStatus == SHOW_RESIZE_HANDLES_MODIFIERS)
|
||||
{
|
||||
handle->show();
|
||||
handle->raise();
|
||||
@@ -720,7 +720,7 @@ void SplitContainer::dragEnterEvent(QDragEnterEvent *event)
|
||||
|
||||
void SplitContainer::mouseMoveEvent(QMouseEvent *event)
|
||||
{
|
||||
if (Split::modifierStatus == showSplitOverlayModifiers)
|
||||
if (Split::modifierStatus == SHOW_SPLIT_OVERLAY_MODIFIERS)
|
||||
{
|
||||
this->setCursor(Qt::PointingHandCursor);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "SplitOverlay.hpp"
|
||||
#include "widgets/splits/SplitOverlay.hpp"
|
||||
|
||||
#include "Application.hpp"
|
||||
#include "singletons/Resources.hpp"
|
||||
|
||||
Reference in New Issue
Block a user