doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made managing of PanelState object consistent with the managing of other state objects

Browse Source
This commit is contained in:
Nav
2022-08-13 18:41:52 +01:00
parent d646e06efe
commit b0b167453d
7 changed files with 74 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Insight/UserInterfaces/InsightWindow/Widgets/PanelState.hpp
View File

@@ -6,7 +6,5 @@ namespace Bloom::Widgets
{
int size = 0;
bool open = false;
PanelState(int size, bool open): size(size), open(open) {};
};
}

69
src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.cpp
View File

@@ -1,61 +1,66 @@
#include "PanelWidget.hpp"
#include <QLayout>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include "PaneWidget.hpp"
namespace Bloom::Widgets
{
PanelWidget::PanelWidget(QWidget* parent): QFrame(parent) {
PanelWidget::PanelWidget(PanelWidgetType type, PanelState& state, QWidget* parent)
: panelType(type)
, state(state)
, QFrame(parent)
{
this->setMouseTracking(false);
this->setAttribute(Qt::WA_Hover, true);
if (this->panelType == PanelWidgetType::LEFT) {
this->resizeCursor = Qt::SplitHCursor;
this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
auto* layout = new QVBoxLayout(this);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
this->setLayout(layout);
} else {
this->resizeCursor = Qt::SplitVCursor;
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
auto* layout = new QHBoxLayout(this);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
this->setLayout(layout);
}
}
void PanelWidget::setMinimumResize(int minimumResize) {
this->minimumResize = minimumResize;
const auto currentSize = this->size();
if (this->panelType == PanelWidgetType::LEFT && currentSize.width() < this->minimumResize) {
this->setFixedWidth(this->minimumResize);
} else if (this->panelType == PanelWidgetType::BOTTOM && currentSize.height() < this->minimumResize) {
this->setFixedHeight(this->minimumResize);
if (this->state.size < this->minimumResize) {
this->setSize(this->minimumResize);
}
}
void PanelWidget::setMaximumResize(int maximumResize) {
this->maximumResize = maximumResize;
const auto currentSize = this->size();
if (this->panelType == PanelWidgetType::LEFT && currentSize.width() > this->maximumResize) {
this->setFixedWidth(this->maximumResize);
} else if (this->panelType == PanelWidgetType::BOTTOM && currentSize.height() > this->maximumResize) {
this->setFixedHeight(this->maximumResize);
}
}
void PanelWidget::setPanelType(PanelWidgetType panelType) {
this->panelType = panelType;
if (this->panelType == PanelWidgetType::LEFT) {
this->resizeCursor = Qt::SplitHCursor;
this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
} else {
this->resizeCursor = Qt::SplitVCursor;
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
if (this->state.size > this->maximumResize) {
this->setSize(this->maximumResize);
}
}
void PanelWidget::setSize(int size) {
if (this->panelType == PanelWidgetType::LEFT) {
this->setFixedWidth(std::min(std::max(size, this->minimumResize), this->maximumResize));
const auto width = std::min(std::max(size, this->minimumResize), this->maximumResize);
this->setFixedWidth(width);
this->state.size = width;
} else if (this->panelType == PanelWidgetType::BOTTOM) {
this->setFixedHeight(std::min(std::max(size, this->minimumResize), this->maximumResize));
const auto height = std::min(std::max(size, this->minimumResize), this->maximumResize);
this->setFixedHeight(height);
this->state.size = height;
}
}
@@ -85,9 +90,11 @@ namespace Bloom::Widgets
}
if (event->type() == QEvent::Type::Close || event->type() == QEvent::Type::Hide) {
this->state.open = false;
emit this->closed();
} else if (event->type() == QEvent::Type::Show) {
this->state.open = true;
emit this->opened();
}

18
src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.hpp
View File

@@ -24,10 +24,11 @@ namespace Bloom::Widgets
Q_OBJECT
Q_PROPERTY(int handleSize READ getHandleSize WRITE setHandleSize DESIGNABLE true)
Q_PROPERTY(int minimumResize READ getMinimumResize WRITE setMinimumResize DESIGNABLE true)
Q_PROPERTY(Bloom::Widgets::PanelWidgetType panelType READ getPanelType WRITE setPanelType DESIGNABLE true)
public:
explicit PanelWidget(QWidget* parent);
PanelState& state;
explicit PanelWidget(PanelWidgetType type, PanelState& state, QWidget* parent);
void setHandleSize(int handleSize) {
this->handleSize = handleSize;
@@ -37,8 +38,6 @@ namespace Bloom::Widgets
void setMaximumResize(int maximumResize);
void setPanelType(PanelWidgetType panelType);
void setSize(int size);
[[nodiscard]] int getHandleSize() const {
@@ -53,17 +52,6 @@ namespace Bloom::Widgets
return this->maximumResize;
}
PanelWidgetType getPanelType() {
return this->panelType;
}
PanelState getCurrentState() {
return PanelState(
this->panelType == PanelWidgetType::LEFT ? this->width() : this->height(),
this->isVisible()
);
}
/**
* Will evaluate whether the panel should still be visible or not (depending on whether there are any
* visible and attached child panes).