diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/IconButton.cc | 1 | ||||
-rw-r--r-- | src/IconbarTool.cc | 2 |
3 files changed, 1 insertions, 6 deletions
@@ -22,8 +22,7 @@ Changes for 1.0rc3: | |||
22 | * Updated nb_NO translations (thanks emptydoor at users dot sf dot net) | 22 | * Updated nb_NO translations (thanks emptydoor at users dot sf dot net) |
23 | nls/nb_NO/Translation.m | 23 | nls/nb_NO/Translation.m |
24 | * Changing session.forcePseudotransparency no longer requires restart, | 24 | * Changing session.forcePseudotransparency no longer requires restart, |
25 | also a little code cleanup in FbTk/Transparent.cc/hh | 25 | also a little code cleanup in FbTk/Transparent.cc/hh (Mark) |
26 | (Mark) | ||
27 | Slit.cc Menu.cc Toolbar.cc FbWinFrame.cc fluxbox.cc | 26 | Slit.cc Menu.cc Toolbar.cc FbWinFrame.cc fluxbox.cc |
28 | * Move triangle drawing into a generic function in FbDrawable (Simon) | 27 | * Move triangle drawing into a generic function in FbDrawable (Simon) |
29 | Make submenu triangles in MenuItems proportional to the icon size | 28 | Make submenu triangles in MenuItems proportional to the icon size |
@@ -99,7 +98,6 @@ Changes for 1.0rc3: | |||
99 | *06/12/28: | 98 | *06/12/28: |
100 | * Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark) | 99 | * Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark) |
101 | Toolbar.cc | 100 | Toolbar.cc |
102 | *06/12/28: | ||
103 | * Allow focus to revert to stuck windows (Mark) | 101 | * Allow focus to revert to stuck windows (Mark) |
104 | FocusControl.cc | 102 | FocusControl.cc |
105 | *06/12/27: | 103 | *06/12/27: |
diff --git a/src/IconButton.cc b/src/IconButton.cc index aaff5b8..eaae85e 100644 --- a/src/IconButton.cc +++ b/src/IconButton.cc | |||
@@ -255,7 +255,6 @@ void IconButton::update(FbTk::Subject *subj) { | |||
255 | FbTk::translateCoords(orientation(), iconx, icony, w, h); | 255 | FbTk::translateCoords(orientation(), iconx, icony, w, h); |
256 | FbTk::translatePosition(orientation(), iconx, icony, neww, newh, 0); | 256 | FbTk::translatePosition(orientation(), iconx, icony, neww, newh, 0); |
257 | 257 | ||
258 | neww = newh; | ||
259 | m_icon_window.moveResize(iconx, icony, neww, newh); | 258 | m_icon_window.moveResize(iconx, icony, neww, newh); |
260 | 259 | ||
261 | m_icon_pixmap.copy(m_win.iconPixmap().drawable(), DefaultDepth(display, screen), screen); | 260 | m_icon_pixmap.copy(m_win.iconPixmap().drawable(), DefaultDepth(display, screen), screen); |
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index 86d7f51..ad4eeeb 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -559,8 +559,6 @@ void IconbarTool::update(FbTk::Subject *subj) { | |||
559 | deleteIcons(); | 559 | deleteIcons(); |
560 | 560 | ||
561 | // ok, we got some signal that we need to update our iconbar container | 561 | // ok, we got some signal that we need to update our iconbar container |
562 | if (mode() == NONE) | ||
563 | return; | ||
564 | updateList(); | 562 | updateList(); |
565 | 563 | ||
566 | // unlock container and update graphics | 564 | // unlock container and update graphics |