diff options
Diffstat (limited to 'kicker/kicker/core')
-rw-r--r-- | kicker/kicker/core/container_extension.cpp | 4 | ||||
-rw-r--r-- | kicker/kicker/core/containerarea.cpp | 8 | ||||
-rw-r--r-- | kicker/kicker/core/extensionmanager.cpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 6e9bfbfeb..721df418e 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -1797,7 +1797,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA if (m_settings.expandSize()) { - height = QMAX(height, hint.height()); + height = TQMAX(height, hint.height()); } } else @@ -1807,7 +1807,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA if (m_settings.expandSize()) { - width = QMAX( width, hint.width() ); + width = TQMAX( width, hint.width() ); } } diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index b34847dbf..5b1eb5c8c 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -1611,8 +1611,8 @@ void ContainerArea::moveDragIndicator(int pos) { int newX = pos; _dragIndicator->resize(_dragIndicator->preferredSize()); - newX = QMAX(newX, availableSpace.left()); - newX = QMIN(newX, + newX = TQMAX(newX, availableSpace.left()); + newX = TQMIN(newX, availableSpace.right() + 1 - _dragIndicator->width() ); _dragIndicator->move(newX, availableSpace.top()); } @@ -1629,8 +1629,8 @@ void ContainerArea::moveDragIndicator(int pos) { int newY = pos; _dragIndicator->resize(_dragIndicator->preferredSize()); - newY = QMAX(newY, availableSpace.top()); - newY = QMIN(newY, + newY = TQMAX(newY, availableSpace.top()); + newY = TQMIN(newY, availableSpace.bottom() + 1 - _dragIndicator->height() ); _dragIndicator->move(availableSpace.left(), newY); } diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 26b792271..796b98125 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -733,22 +733,22 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens { case KPanelExtension::Left: { - area.setLeft(QMAX(area.left(), geom.right())); + area.setLeft(TQMAX(area.left(), geom.right())); break; } case KPanelExtension::Right: { - area.setRight(QMIN(area.right(), geom.left())); + area.setRight(TQMIN(area.right(), geom.left())); break; } case KPanelExtension::Top: { - area.setTop(QMAX(area.top(), geom.bottom())); + area.setTop(TQMAX(area.top(), geom.bottom())); break; } case KPanelExtension::Bottom: { - area.setBottom(QMIN(area.bottom(), geom.top())); + area.setBottom(TQMIN(area.bottom(), geom.top())); break; } default: ; // ignore KPanelExtension::Floating ... at least for now |