summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 4906727..a31fbaf 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.94 2003/06/24 18:33:29 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.95 2003/06/25 12:33:28 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -857,8 +857,7 @@ void Toolbar::redrawWindowLabel(bool redraw) {
857 } else 857 } else
858 dy += frame.bevel_w; 858 dy += frame.bevel_w;
859 859
860 m_theme.font().drawText( 860 m_theme.font().drawText(frame.window_label.window(),
861 frame.window_label.window(),
862 screen().screenNumber(), 861 screen().screenNumber(),
863 m_theme.windowTextGC(), 862 m_theme.windowTextGC(),
864 foc->title().c_str(), newlen, 863 foc->title().c_str(), newlen,
@@ -1176,6 +1175,10 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
1176 frame.button_w = frame.height; 1175 frame.button_w = frame.height;
1177 } 1176 }
1178 1177
1178 // So we get at least one pixel visible in hidden mode
1179 if (bevel_width <= border_width)
1180 bevel_width = border_width + 1;
1181
1179 switch (where) { 1182 switch (where) {
1180 case TOPLEFT: 1183 case TOPLEFT:
1181 frame.x = head_x; 1184 frame.x = head_x;
@@ -1193,7 +1196,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
1193 break; 1196 break;
1194 1197
1195 case TOPCENTER: 1198 case TOPCENTER:
1196 frame.x = head_x + ((head_w - frame.width) / 2); 1199 frame.x = head_x + (head_w - frame.width) / 2;
1197 frame.y = head_y; 1200 frame.y = head_y;
1198 frame.x_hidden = frame.x; 1201 frame.x_hidden = frame.x;
1199 frame.y_hidden = head_y + bevel_width - border_width - frame.height; 1202 frame.y_hidden = head_y + bevel_width - border_width - frame.height;
@@ -1255,7 +1258,6 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
1255 frame.y_hidden = frame.y; 1258 frame.y_hidden = frame.y;
1256 break; 1259 break;
1257 } 1260 }
1258
1259} 1261}
1260 1262
1261void Toolbar::HideHandler::timeout() { 1263void Toolbar::HideHandler::timeout() {