- fix client positions a bit (still a bit ugly)

3 files changed, 11 insertions, 8 deletions

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index 7586c627..474e295d 100644
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -9,6 +9,8 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 	m_desktop = 0;
 	m_have_background_color = 0;
 	
+	m_client_offset = eSize(0, 0);
+	
 	if (m_parent)
 		m_vis = wVisShow;
 		
@@ -24,11 +26,11 @@ eWidget::eWidget(eWidget *parent): m_parent(parent ? parent->child() : 0)
 
 void eWidget::move(ePoint pos)
 {
+	m_position = pos + m_client_offset;
+	
 	if (m_position == pos)
 		return;
 	
-	m_position = pos;
-	
 		/* we invalidate before and after the move to
 		   cause a correct redraw. The area which is
 		   included both before and after isn't redrawn
@@ -49,11 +51,13 @@ void eWidget::resize(eSize size)
 		   fits into the other completely, and invalidate
 		   only once. */
 	eSize old_size = m_size;
-	eSize offset = eSize(0, 0);
-	event(evtWillChangeSize, &size, &offset);
+	eSize old_offset = m_client_offset;
+	m_client_offset = eSize(0, 0);
+	event(evtWillChangeSize, &size, &m_client_offset);
 	if (old_size == m_size)
 		return;
-	move(position() + offset);
+	
+	move(position() - old_offset);
 	
 	invalidate();
 	event(evtChangedSize);
@@ -278,7 +282,6 @@ int eWidget::event(int event, void *data, void *data2)
 
 void eWidget::setFocus(eWidget *focus)
 {
-	eDebug("setFocus in %p to %p, was %p", this, focus, m_current_focus);
 	if (m_current_focus)
 		m_current_focus->event(evtFocusLost, this);
 	
diff --git a/lib/gui/ewidget.h b/lib/gui/ewidget.h
index 345977f2..89b3b38f 100644
--- a/lib/gui/ewidget.h
+++ b/lib/gui/ewidget.h
@@ -53,6 +53,8 @@ private:
 	ePtrList<eWidget> m_childs;
 	ePoint m_position;
 	eSize m_size;
+		/* will be accounted when there's a client offset */
+	eSize m_client_offset;
 	eWidget *m_parent;
 	
 	ePtr<eWindowStyle> m_style;
diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index 01f889ff..e637cf22 100644
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -70,9 +70,7 @@ int eWindow::event(int event, void *data, void *data2)
 				style->handleNewSize(this, new_size, offset);
 			}
 		} else
-		{
 			m_child->resize(new_size);
-		}
 		break;
 	}
 	case evtPaint: