[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/khtml/patches
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-05-16 18:12:14
Message-ID: 1147803134.471031.13843.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 541601 by eva:

Qt2:
fixed the problem with overflow:auto CSS settings. This appeared in 1&1
mailaccount (mail->view details)


 M  +18 -15    rendering_qt2.3.patch  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/rendering_qt2.3.patch #541600:541601
@@ -1486,39 +1486,42 @@
  
 --- ./render_layer.cpp	
 +++ khtml/rendering/render_layer.cpp	
-@@ -552,7 +552,10 @@ int RenderLayer::verticalScrollbarWidth(
+@@ -552,7 +552,11 @@ int RenderLayer::verticalScrollbarWidth(
  #ifdef APPLE_CHANGES
      return m_vBar->width();
  #else
 -    return m_vBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
-+// \FIXME    return m_vBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
-+	int sliderMin, sliderMax, sliderLength, buttonDim;
-+	m_hBar->style().scrollBarMetrics(m_hBar, sliderMin, sliderMax, sliderLength, buttonDim);
-+	return sliderMax;
++#if (QT_VERSION < 0x030000)
++    return m_hBar->style().scrollBarExtent().width();
++#else
++    return m_vBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
++#endif
  #endif
  
  }
-@@ -565,7 +568,10 @@ int RenderLayer::horizontalScrollbarHeig
+@@ -565,7 +568,11 @@ int RenderLayer::horizontalScrollbarHeig
  #ifdef APPLE_CHANGES
      return m_hBar->height();
  #else
 -    return m_hBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
-+    // \FIXME return m_hBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
-+	int sliderMin, sliderMax, sliderLength, buttonDim;
-+	m_hBar->style().scrollBarMetrics(m_hBar, sliderMin, sliderMax, sliderLength, buttonDim);
-+	return sliderMax;
++#if (QT_VERSION < 0x030000)
++    return m_hBar->style().scrollBarExtent().height();
++#else
++    return m_hBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
++#endif
  #endif
  
  }
-@@ -615,7 +621,10 @@ void RenderLayer::positionScrollbars(con
+@@ -615,7 +621,11 @@ void RenderLayer::positionScrollbars(con
      QScrollBar *b = m_hBar;
      if (!m_hBar)
  	b = m_vBar;
 -    int sw = b->style().pixelMetric(QStyle::PM_ScrollBarExtent);
-+ // \FIXME    int sw = b->style().pixelMetric(QStyle::PM_ScrollBarExtent);
-+	int sliderMin, sliderMax, sliderLength, buttonDim;
-+	m_hBar->style().scrollBarMetrics(m_hBar, sliderMin, sliderMax, sliderLength, buttonDim);
-+	int sw = sliderMax;
++#if (QT_VERSION < 0x030000)
++    int sw = m_hBar->style().scrollBarExtent().height();
++#else
++    int sw = b->style().pixelMetric(QStyle::PM_ScrollBarExtent);
++#endif
  
      if (m_vBar) {
  	QRect vBarRect = QRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1);
[prev in list] [next in list] [prev in thread] [next in thread]