From 0d913407352c255b944c098c35e43b8c0db2c4e2 Mon Sep 17 00:00:00 2001 From: Rik Hemsley Date: Thu, 11 May 2000 04:17:35 +0000 Subject: [PATCH] Fixed some silliness. Removed more layout code. svn path=/trunk/kdebase/kwin/; revision=49145 --- clients/riscos/Manager.cpp | 10 ++++++++++ clients/riscos/Manager.h | 4 ++-- clients/riscos/ResizeBar.cpp | 15 ++++++++------- clients/riscos/ResizeBar.h | 4 ++++ clients/riscos/TitleText.cpp | 9 ++++----- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/clients/riscos/Manager.cpp b/clients/riscos/Manager.cpp index 6c998573d2..244f7d8ab3 100644 --- a/clients/riscos/Manager.cpp +++ b/clients/riscos/Manager.cpp @@ -183,6 +183,16 @@ Manager::activateLayout() _updateLayout(); } + void +Manager::fakeMouseEvent(QMouseEvent * e, QWidget * w) +{ + QPoint adjustedPos = w->pos() + e->pos(); + + QMouseEvent fake(e->type(), adjustedPos, e->button(), e->state()); + + Client::event(&fake); +} + } // End namespace // vim:ts=2:sw=2:tw=78 diff --git a/clients/riscos/Manager.h b/clients/riscos/Manager.h index 499e528eea..65adad068f 100644 --- a/clients/riscos/Manager.h +++ b/clients/riscos/Manager.h @@ -35,8 +35,6 @@ class Manager : public Client { Q_OBJECT - friend class TitleText; - public: Manager(Workspace *, WId, QWidget * parent = 0, const char * name = 0); @@ -44,6 +42,8 @@ class Manager : public Client void setShade(bool); + void fakeMouseEvent(QMouseEvent *, QWidget *); + signals: void maximiseChanged(bool); diff --git a/clients/riscos/ResizeBar.cpp b/clients/riscos/ResizeBar.cpp index 44c4138a12..0641379fa5 100644 --- a/clients/riscos/ResizeBar.cpp +++ b/clients/riscos/ResizeBar.cpp @@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA. */ -#include - #include "ResizeBar.h" #include "ResizeMid.h" #include "ResizeSide.h" @@ -41,11 +39,7 @@ ResizeBar::ResizeBar(QWidget * parent, Manager * client) mid_ = new ResizeMid(this, client_); right_ = new ResizeSide(this, client_, ResizeSide::Right); - QHBoxLayout * layout = new QHBoxLayout(this); - - layout->addWidget(left_); - layout->addWidget(mid_, 1); - layout->addWidget(right_); + mid_->move(30, 0); } void @@ -56,6 +50,13 @@ ResizeBar::updateDisplay() right_->updateDisplay(); } + void +ResizeBar::resizeEvent(QResizeEvent *) +{ + mid_->resize(width() - 60, 10); + right_->move(width() - 30, 0); +} + } // End namespace // vim:ts=2:sw=2:tw=78 diff --git a/clients/riscos/ResizeBar.h b/clients/riscos/ResizeBar.h index fdcc40e114..10bb81c6cc 100644 --- a/clients/riscos/ResizeBar.h +++ b/clients/riscos/ResizeBar.h @@ -42,6 +42,10 @@ class ResizeBar : public QWidget ResizeBar(QWidget * parent, Manager * client); void updateDisplay(); + protected: + + void resizeEvent(QResizeEvent *); + private: Manager * client_; diff --git a/clients/riscos/TitleText.cpp b/clients/riscos/TitleText.cpp index 07a42d5972..eb2e1cde17 100644 --- a/clients/riscos/TitleText.cpp +++ b/clients/riscos/TitleText.cpp @@ -23,7 +23,6 @@ #include #include "../../options.h" -#include "../../workspace.h" #include "TitleText.h" #include "Manager.h" @@ -68,25 +67,25 @@ TitleText::updatePixmap() void TitleText::mousePressEvent(QMouseEvent * e) { - client_->mousePressEvent(e); + client_->fakeMouseEvent(e, this); } void TitleText::mouseReleaseEvent(QMouseEvent * e) { - client_->mouseReleaseEvent(e); + client_->fakeMouseEvent(e, this); } void TitleText::mouseMoveEvent(QMouseEvent * e) { - client_->mouseMoveEvent(e); + client_->fakeMouseEvent(e, this); } void TitleText::mouseDoubleClickEvent(QMouseEvent * e) { - client_->mouseDoubleClickEvent(e); + client_->fakeMouseEvent(e, this); } } // End namespace