From 68e1eef27bf0ec8038af24f192c305fede10a367 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 29 Jan 2017 10:04:40 +0200 Subject: [PATCH] remove maxLength from dockview --- app/dockview.cpp | 24 ------------------------ app/dockview.h | 6 ------ 2 files changed, 30 deletions(-) diff --git a/app/dockview.cpp b/app/dockview.cpp index 119181a15..56475aa73 100644 --- a/app/dockview.cpp +++ b/app/dockview.cpp @@ -129,11 +129,6 @@ void DockView::adaptToScreen(QScreen *screen) { setScreen(screen); - if (formFactor() == Plasma::Types::Vertical) - m_maxLength = screen->size().height(); - else - m_maxLength = screen->size().width(); - if (containment()) containment()->reactToScreenChange(); @@ -272,26 +267,21 @@ void DockView::updatePosition() switch (location()) { case Plasma::Types::TopEdge: position = {screenGeometry.x(), screenGeometry.y()}; - m_maxLength = screenGeometry.width(); break; case Plasma::Types::BottomEdge: position = {screenGeometry.x(), screenGeometry.y() + screenGeometry.height() - height()}; - m_maxLength = screenGeometry.width(); break; case Plasma::Types::RightEdge: position = {screenGeometry.x() + screenGeometry.width() - width(), screenGeometry.y()}; - m_maxLength = screenGeometry.height(); break; case Plasma::Types::LeftEdge: position = {screenGeometry.x(), screenGeometry.y()}; - m_maxLength = screenGeometry.height(); break; default: qWarning() << "wrong location, couldn't update the panel position" << location(); } - emit maxLengthChanged(); setPosition(position); } @@ -384,20 +374,6 @@ void DockView::setMaxThickness(int thickness) emit maxThicknessChanged(); } -int DockView::maxLength() const -{ - return m_maxLength; -} - -void DockView::setMaxLength(int maxLength) -{ - if (m_maxLength == maxLength) - return; - - m_maxLength = maxLength; - emit maxLengthChanged(); -} - QRect DockView::maskArea() const { return m_maskArea; diff --git a/app/dockview.h b/app/dockview.h index 06a039a21..2007c4f8a 100644 --- a/app/dockview.h +++ b/app/dockview.h @@ -46,7 +46,6 @@ class DockView : public PlasmaQuick::ContainmentView { Q_PROPERTY(int docksCount READ docksCount NOTIFY docksCountChanged) Q_PROPERTY(int width READ width NOTIFY widthChanged) Q_PROPERTY(int height READ height NOTIFY heightChanged) - Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged) Q_PROPERTY(int maxThickness READ maxThickness WRITE setMaxThickness NOTIFY maxThicknessChanged) Q_PROPERTY(int normalThickness READ normalThickness WRITE setNormalThickness NOTIFY normalThicknessChanged) Q_PROPERTY(int shadow READ shadow WRITE setShadow NOTIFY shadowChanged) @@ -71,9 +70,6 @@ public: int docksCount() const; - int maxLength() const; - void setMaxLength(int maxLength); - int maxThickness() const; void setMaxThickness(int thickness); @@ -120,7 +116,6 @@ signals: void docksCountChanged(); void widthChanged(); void heightChanged(); - void maxLengthChanged(); void maxThicknessChanged(); void normalThicknessChanged(); void visibilityChanged(); @@ -144,7 +139,6 @@ private: private: Plasma::Containment *containmentById(int id); - int m_maxLength{INT_MAX}; int m_maxThickness{24}; int m_normalThickness{24}; int m_shadow{0};