forgot to commit these

This commit is contained in:
espie 2008-01-29 22:11:28 +00:00
parent 6692106c6c
commit b5209bf95e
2 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-applets_lancelot_app_src_BaseActionWidget_cpp,v 1.1 2008/01/29 22:11:28 espie Exp $
--- applets/lancelot/app/src/BaseActionWidget.cpp.orig Sun Jan 27 17:15:49 2008
+++ applets/lancelot/app/src/BaseActionWidget.cpp Sun Jan 27 17:17:53 2008
@@ -91,6 +91,11 @@ void BaseActionWidget::paintWidget ( QPainter * painte
}
+inline float fmaxf(float a, float b)
+{
+ return a > b ? a : b;
+}
+
void BaseActionWidget::paintForeground (QPainter * painter) {
QPainter * _painter = painter;
@@ -158,7 +163,8 @@ void BaseActionWidget::paintForeground (QPainter * pai
if (m_icon || m_iconInSvg) { // using real painter...
iconRect.moveTop(top);
- QRect rect(QPoint(lround(iconRect.left()), lround(iconRect.top())), m_iconSize);
+ QPoint p(lround(iconRect.left()), lround(iconRect.top()));
+ QRect rect(p, m_iconSize);
if (m_icon) {
m_icon->paint(_painter, rect);
} else {
@@ -213,7 +219,8 @@ void BaseActionWidget::paintForeground (QPainter * pai
descriptionRect.moveLeft(WIDGET_PADDING + iconRect.right());
if (m_icon || m_iconInSvg) { // using real painter...
- QRect rect(QPoint(lround(iconRect.left()), lround(iconRect.top())), m_iconSize);
+ QPoint p(lround(iconRect.left()), lround(iconRect.top()));
+ QRect rect(p, m_iconSize);
if (m_icon) {
QIcon::Mode mode;
if (!m_enabled) {

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-applets_lancelot_app_src_ui_LancelotWindow_h,v 1.1 2008/01/29 22:11:28 espie Exp $
--- applets/lancelot/app/src/ui_LancelotWindow.h.orig Sun Jan 27 17:14:11 2008
+++ applets/lancelot/app/src/ui_LancelotWindow.h Sun Jan 27 17:15:12 2008
@@ -343,7 +343,7 @@ class LancelotWindow (protected)
layoutSearch->addItem(editSearchPositioner,
Plasma::NodeLayout::NodeCoordinate(0.5, 0.5, 0, 0),
- Plasma::NodeLayout::NodeCoordinate(1.0, 0.5, -10, INFINITY)
+ Plasma::NodeLayout::NodeCoordinate(1.0, 0.5, -10, DBL_MAX)
);
layoutSearch->addItem(labelSearch,
Plasma::NodeLayout::NodeCoordinate(0.5, 0.5, 0, 0),