2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bc3d0fc..786269b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/08/07:
+   * Rotate toolbar background texture along with toolbar, bug #1694959 (Mark)
+     Toolbar.cc
 *07/08/06:
    * Fix KDE Dockapps on restart (dont unmap), and some minor tweaks (Simon)
      SystemTray.hh/cc
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 6552859..ad1a8e5 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -466,8 +466,16 @@ void Toolbar::reconfigure() {
         m_window_pm = 0;
         frame.window.setBackgroundColor(theme().toolbar().color());
     } else {
-        m_window_pm = screen().imageControl().renderImage(frame.window.width(), frame.window.height(),
-                                                          theme().toolbar());
+        FbTk::Orientation orient = FbTk::ROT0;
+        Toolbar::Placement where = *m_rc_placement;
+        if (where == LEFTCENTER || where == LEFTTOP || where == LEFTBOTTOM)
+            orient = FbTk::ROT270;
+        if (where == RIGHTCENTER || where == RIGHTTOP || where == RIGHTBOTTOM)
+            orient = FbTk::ROT90;
+
+        m_window_pm = screen().imageControl().renderImage(
+                          frame.window.width(), frame.window.height(),
+                          theme().toolbar(), orient);
         frame.window.setBackgroundPixmap(m_window_pm);
     }
     if (tmp)