diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-12 20:41:23 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-12 20:41:23 +0000 |
commit | d832f2f1a4a547f70b3d3efd3b75fa7dfe72d5f1 (patch) | |
tree | 9a1e535e09a9cae666eb171c77d5c99ab63a624c /packages/opie-taskbar | |
parent | 9fd684a9c55060e44f153d910ad07504c60d5694 (diff) | |
parent | e0af6741598e11ed840c837668e23168f66737d2 (diff) |
merge of '0fc95be78cc0959135ca79a4ec38a38f14160eef'
and '4ed12f8853fc35aaa445b675fde2edc9d8b0f0ab'
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r-- | packages/opie-taskbar/opie-taskbar/01-1px-gap.patch | 12 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch b/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch new file mode 100644 index 0000000000..bfb4d1d234 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch @@ -0,0 +1,12 @@ +diff -Naru launcher.orig/serverinterface.cpp launcher/serverinterface.cpp +--- launcher.orig/serverinterface.cpp 2003-08-28 16:45:00.000000000 +0200 ++++ launcher/serverinterface.cpp 2007-07-05 13:02:08.000000000 +0200 +@@ -113,7 +113,7 @@ + mwr.setTop( w->geometry().bottom() + 1 ); + break; + case ServerInterface::Bottom: +- w->setGeometry( mwr.left(), mwr.bottom() - sh.height(), ++ w->setGeometry( mwr.left(), mwr.bottom() - sh.height() + 1, + mwr.width(), sh.height() ); + mwr.setBottom( w->geometry().top() - 1 ); + break; diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index ad3931adc7..a2d69a7af1 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r13" +PR = "r14" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -12,6 +12,7 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://nomax.patch;patch=1;pnum=3 \ file://no-builtin-qss-startup.patch;patch=1 \ file://kbdlocks-runtime.patch;patch=1 \ - file://server.pro \ file://restart-from-bindir.patch;patch=1 \ + file://01-1px-gap.patch;patch=1 \ + file://server.pro \ " |