summaryrefslogtreecommitdiffstats
path: root/client/fahrenheitclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'client/fahrenheitclient.cpp')
-rw-r--r--client/fahrenheitclient.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/client/fahrenheitclient.cpp b/client/fahrenheitclient.cpp
index 0d7f96d..61c8d63 100644
--- a/client/fahrenheitclient.cpp
+++ b/client/fahrenheitclient.cpp
@@ -1149,19 +1149,19 @@ void FahrenheitClient::doShape()
mask -= TQRegion(tr, 0, r, 9);
// Remove top area above blank bar and top-right corner.
- if (barWidth <= 12 || rightButtonWidth == 0) {
- //mask -= TQRegion(tr + leftButtonWidth + 6, 0, barWidth - 10, 13);
- mask -= TQRegion(tr + leftButtonWidth + 1, 9, barWidth + btnBarWidth + 6, 1);
- mask -= TQRegion(tr + leftButtonWidth + 3, 10, barWidth + btnBarWidth + 4, 1);
- mask -= TQRegion(tr + leftButtonWidth + 5, 11, barWidth + btnBarWidth + 2, 1);
- mask -= TQRegion(tr + leftButtonWidth + 7, 12, barWidth + btnBarWidth, 1);
- } else {
- // right button left edge mask
- mask -= TQRegion(tr + leftButtonWidth + 1, 9, barWidth + 1, 1);
- mask -= TQRegion(tr + leftButtonWidth + 3, 10, barWidth - 3, 1);
- mask -= TQRegion(tr + leftButtonWidth + 5, 11, barWidth - 7, 1);
- mask -= TQRegion(tr + leftButtonWidth + 7, 12, barWidth - 11, 1);
- }
+ if (barWidth > 12 && rightButtonWidth > 0) {
+ // right button left edge mask
+ mask -= TQRegion(tr + leftButtonWidth + 1, 9, barWidth + 1, 1);
+ mask -= TQRegion(tr + leftButtonWidth + 3, 10, barWidth - 3, 1);
+ mask -= TQRegion(tr + leftButtonWidth + 5, 11, barWidth - 7, 1);
+ mask -= TQRegion(tr + leftButtonWidth + 7, 12, barWidth - 11, 1);
+ } else if (rightButtonWidth == 0) {
+ //mask -= TQRegion(tr + leftButtonWidth + 6, 0, barWidth - 10, 13);
+ mask -= TQRegion(tr + leftButtonWidth + 1, 9, barWidth + btnBarWidth + 6, 1);
+ mask -= TQRegion(tr + leftButtonWidth + 3, 10, barWidth + btnBarWidth + 4, 1);
+ mask -= TQRegion(tr + leftButtonWidth + 5, 11, barWidth + btnBarWidth + 2, 1);
+ mask -= TQRegion(tr + leftButtonWidth + 7, 12, barWidth + btnBarWidth, 1);
+ }
if (rightButtonWidth > 0) {
// right edge mask