Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2011-11-28 12:53:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2011-11-16 17:18:28.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2011-11-28 12:53:57.000000000 +0100
@@ -1,0 +2,32 @@
+Thu Nov 24 23:31:35 CET 2011 - jsl...@suse.de
+
+- show window size in characters if resizing terminal (bnc#703594)
+
+-------------------------------------------------------------------
+Mon Nov 21 13:39:49 UTC 2011 - co...@suse.com
+
+- revert most of the branding commit
+
+-------------------------------------------------------------------
+Sun Nov 20 12:23:44 UTC 2011 - toddrme2...@gmail.com
+
+- Fixed self-obsoletes (fix for RPMLINT warning)
+- Added %kde4_runtime_requires (fix for RPMLINT warning)
+- Added %kde4_akonadi_requires (fix for RPMLINT warning)
+- Added %kde4_pimlibs_requires (fix for RPMLINT warning)
+- Enabled -fPIE building (fix for RPMLINT warning)
+- Added permission prereq (fix for RPMLINT warning)
+- Added %set_permissions macros (fix for RPMLINT warning)
+- Fixed permissions for kcheckpass (fix for RPMLINT warning)
+- Fixed devel package group (fix for RPMLINT warning)
+- Added %config tag (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+
+-------------------------------------------------------------------
+Fri Nov 18 17:28:50 UTC 2011 - alinm.el...@gmail.com
+
+- bumped the branding version to reflect 12.1 and factory
+- fixed kwin dependency on the opensuse branding
+- reworked the logic for selecting the version string
+
+-------------------------------------------------------------------
Old:
----
changeset_r639155a5493a28ca9460d60fa0c078ec65c3bb96.diff
New:
----
changeset_r245a56e4ef07519282ef1176af59a4f1f1798ca4.diff
changeset_r3b6514d12639be222e520e4ff9a776be1017c05b.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
++++ 974 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.spec
++++ and
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.spec
++++++ changeset_r245a56e4ef07519282ef1176af59a4f1f1798ca4.diff ++++++
commit 245a56e4ef07519282ef1176af59a4f1f1798ca4
Author: Thomas Lübking <thomas.luebk...@gmail.com>
Date: Sun Nov 13 18:38:03 2011 +0100
use contentsrect to calculate window size if baseUnit isn't 1,1
BUG: 283518
diff --git a/kwin/effects/windowgeometry/windowgeometry.cpp
b/kwin/effects/windowgeometry/windowgeometry.cpp
index 43de301..a9fd796 100644
--- a/kwin/effects/windowgeometry/windowgeometry.cpp
+++ b/kwin/effects/windowgeometry/windowgeometry.cpp
@@ -158,8 +158,12 @@ void
WindowGeometry::slotWindowStepUserMovedResized(EffectWindow *w, const QRect
dy = r.height() - r2.height();
const QSize baseInc = w->basicUnit();
- Q_ASSERT(baseInc.width() && baseInc.height());
- myMeasure[1]->setText( i18nc(myResizeString,
r.width()/baseInc.width(), r.height()/baseInc.height(),
number(dx/baseInc.width()), number(dy/baseInc.height()) ) );
+ if (baseInc != QSize(1,1)) {
+ Q_ASSERT(baseInc.width() && baseInc.height());
+ const QSize csz = w->contentsRect().size();
+ myMeasure[1]->setText( i18nc(myResizeString,
csz.width()/baseInc.width(), csz.height()/baseInc.height(),
number(dx/baseInc.width()), number(dy/baseInc.height()) ) );
+ } else
+ myMeasure[1]->setText( i18nc(myResizeString, r.width(),
r.height(), number(dx), number(dy) ) );
// calc width for bottomright element, superfluous otherwise
dx = r.right() - r2.right();
++++++ changeset_r3b6514d12639be222e520e4ff9a776be1017c05b.diff ++++++
commit 3b6514d12639be222e520e4ff9a776be1017c05b
Author: Thomas Lübking <thomas.luebk...@gmail.com>
Date: Wed Nov 2 23:05:03 2011 +0100
export the baseincrement size to the effectwindow and utilize it in the
windowgeometry effect
BUG: 283518
REVIEW: 103033
FIXED-IN: 4.8
---
kwin/client.h | 1 +
kwin/effects.cpp | 6 ++++++
kwin/effects.h | 1 +
kwin/effects/windowgeometry/windowgeometry.cpp | 4 +++-
kwin/geometry.cpp | 5 +++++
kwin/libkwineffects/kwineffects.h | 7 ++++++-
6 files changed, 22 insertions(+), 2 deletions(-)
--- a/kwin/client.h
+++ b/kwin/client.h
@@ -126,6 +126,7 @@ public:
QSize minSize() const;
QSize maxSize() const;
+ QSize basicUnit() const;
virtual QPoint clientPos() const; // Inside of geometry()
virtual QSize clientSize() const;
virtual QRect visibleRect() const;
--- a/kwin/effects.cpp
+++ b/kwin/effects.cpp
@@ -1370,6 +1370,12 @@ int EffectWindowImpl::height() const
return toplevel->height();
}
+QSize EffectWindowImpl::basicUnit() const
+{
+ Client *client = dynamic_cast<Client*>(toplevel);
+ return client ? client->basicUnit() : QSize(1,1);
+}
+
QRect EffectWindowImpl::geometry() const
{
return toplevel->geometry();
--- a/kwin/effects.h
+++ b/kwin/effects.h
@@ -246,6 +246,7 @@ public:
virtual int y() const;
virtual int width() const;
virtual int height() const;
+ virtual QSize basicUnit() const;
virtual QRect geometry() const;
virtual QRegion shape() const;
virtual int screen() const;
--- a/kwin/effects/windowgeometry/windowgeometry.cpp
+++ b/kwin/effects/windowgeometry/windowgeometry.cpp
@@ -157,7 +157,9 @@ void WindowGeometry::slotWindowStepUserM
dx = r.width() - r2.width();
dy = r.height() - r2.height();
- myMeasure[1]->setText( i18nc(myResizeString, r.width(),
r.height(), number(dx), number(dy) ) );
+ const QSize baseInc = w->basicUnit();
+ Q_ASSERT(baseInc.width() && baseInc.height());
+ myMeasure[1]->setText( i18nc(myResizeString,
r.width()/baseInc.width(), r.height()/baseInc.height(),
number(dx/baseInc.width()), number(dy/baseInc.height()) ) );
// calc width for bottomright element, superfluous otherwise
dx = r.right() - r2.right();
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
@@ -1566,6 +1566,11 @@ QSize Client::maxSize() const
return rules()->checkMaxSize(QSize(xSizeHint.max_width,
xSizeHint.max_height));
}
+QSize Client::basicUnit() const
+{
+ return QSize(xSizeHint.width_inc, xSizeHint.height_inc);
+}
+
/*!
Auxiliary function to inform the client about the current window
configuration.
--- a/kwin/libkwineffects/kwineffects.h
+++ b/kwin/libkwineffects/kwineffects.h
@@ -166,7 +166,7 @@ X-KDE-Library=kwin4_effect_cooleffect
#define KWIN_EFFECT_API_MAKE_VERSION( major, minor ) (( major ) << 8 | ( minor
))
#define KWIN_EFFECT_API_VERSION_MAJOR 0
-#define KWIN_EFFECT_API_VERSION_MINOR 180
+#define KWIN_EFFECT_API_VERSION_MINOR 182
#define KWIN_EFFECT_API_VERSION KWIN_EFFECT_API_MAKE_VERSION( \
KWIN_EFFECT_API_VERSION_MAJOR, KWIN_EFFECT_API_VERSION_MINOR )
@@ -1087,6 +1087,11 @@ public:
virtual int y() const = 0;
virtual int width() const = 0;
virtual int height() const = 0;
+ /**
+ * By how much the window wishes to grow/shrink at least. Usually
QSize(1,1).
+ * MAY BE DISOBEYED BY THE WM! It's only for information, do NOT rely on
it at all.
+ */
+ virtual QSize basicUnit() const = 0;
virtual QRect geometry() const = 0;
virtual QRegion shape() const = 0;
virtual int screen() const = 0;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
