diff options
Diffstat (limited to 'kicker/taskbar/taskcontainer.cpp')
| -rw-r--r-- | kicker/taskbar/taskcontainer.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 7d0e4d3cd..115e61610 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -583,8 +583,8 @@ void TaskContainer::drawButton(TQPainter *p) bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), - tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), + tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) @@ -653,7 +653,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw modified overlay if (!modPixmap.isNull()) { - TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, + TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -670,7 +670,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw text if (!text.isEmpty()) { - TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; @@ -787,7 +787,7 @@ void TaskContainer::drawButton(TQPainter *p) } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { @@ -799,7 +799,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); if (aboutToActivate) { @@ -1161,17 +1161,17 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() + width()); break; case LeftArrow: - pos.setX(pos.x() - m_menu->tqsizeHint().width()); + pos.setX(pos.x() - m_menu->sizeHint().width()); break; case DownArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); - pos.setY(pos.y() - m_menu->tqsizeHint().height()); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); + pos.setY(pos.y() - m_menu->sizeHint().height()); break; default: break; |