FCL/sf/app/browserui: comparison ginebra2/ContentViews/GWebContentViewWidget.cpp

equal deleted inserted replaced

-:0f2326c2a325
+:1c3b8676e58c
 , m_currentinitialScale(0)
 , m_previousViewPortwidth(size().toSize().width())
 , m_bitmapImage(NULL)
 , m_checkeredBoxPixmap(NULL)
 {
-qDebug() << "GWebContentViewWidget::GWebContentViewWidget: page=" << pg;
+setParent(parent);
-setParent(parent);
 if ( pg ) {
 setPage(pg);
 }
 #ifdef ENABLE_PERF_TRACE
 WrtPerfTracer::tracer()->initPage(pg);
 #endif //ENABLE_PERF_TRACE
 m_currentinitialScale = zoomFactor();
-//connect(this->page()->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(onInitLayout()));
 #ifndef NO_QSTM_GESTURE
 m_touchNavigation = new WebTouchNavigation(this);
 #endif
 // Fixes missing radio button problem with certain themes
 QPalette pal = palette();
 void GWebContentViewWidget::setCheckeredPixmap()
 {
 delete m_checkeredBoxPixmap;
 m_checkeredBoxPixmap = NULL;
-int checkerPixmapSizeX = size().toSize().width();
-int checkerPixmapSizeY = size().toSize().height() + 50;
 m_checkeredBoxPixmap = new QPixmap(checkerSize, checkerSize);
 QPainter painter(m_checkeredBoxPixmap);
 painter.fillRect(0, 0, checkerSize, checkerSize, QColor(checkerColor1));
 painter.fillRect(0, checkerSize/2, checkerSize/2, checkerSize/2, QColor(checkerColor2));
 painter.fillRect(checkerSize/2, 0, checkerSize/2, checkerSize/2, QColor(checkerColor2));
 m_bitmapImage = NULL;
 }
 }
 void GWebContentViewWidget::updateFrozenImage() {
-// Take a snapshot for to be displayed while in frozen state.
+// Take a snapshot to be displayed while in frozen state.
-QStyleOptionGraphicsItem opt;
-opt.levelOfDetail = 1.0;
+QStyleOptionGraphicsItem option;
-opt.exposedRect = QRectF(QPointF(0,0), size());
+option.levelOfDetail = 1.0;
+option.exposedRect = QRectF(QPointF(0,0), size());
-m_frozenPixmap = new QPixmap(opt.exposedRect.size().toSize());
-QPainter painter(m_frozenPixmap);
+// Discard existing pixmap.
-paint(&painter, &opt);
+delete m_frozenPixmap;
+m_frozenPixmap = 0;
-if(!isEnabled()) {
-// Disabled, apply whitewash.
+// Paint the window into a new pixmap (m_frozenPixmap must be 0 here for this to work).
+QPixmap *frozenPixmap = new QPixmap(option.exposedRect.size().toSize());
-painter.setOpacity(ChromeEffect::disabledOpacity);
+QPainter painter(frozenPixmap);
-painter.fillRect(opt.exposedRect, ChromeEffect::disabledColor);
+paint(&painter, &option);
-}
 painter.end();
+// Now point m_frozenPixmap at the new pixmap.
+m_frozenPixmap = frozenPixmap;
 }
 QImage GWebContentViewWidget::getPageSnapshot()
 {
 QImage img(size().toSize(), QImage::Format_RGB32);
 void GWebContentViewWidget::updateViewportSize(::QGraphicsSceneResizeEvent* e)
 {
 //if there is change in mode (like landscape, potraite relayout the content)
 if (e->newSize().width() == e->oldSize().width())
 return;
+//if page is empty do not update
+if (page()->currentFrame()->url().isEmpty())
+return;
 m_isResize = true;
 setViewportSize();
 m_isResize = false;
 }
 return QGraphicsWebView::event(e);
 }
 void GWebContentViewWidget::resizeEvent(QGraphicsSceneResizeEvent* e)
 {
 // set the fixed text layout size for text wrapping
 #if defined CWRTINTERNALWEBKIT
 if (page()) {
 p->m_webPage->settings()->setMaximumTextColumnWidth(e->newSize().width() - 6);
 }
 page()->setViewportSize(s);
 }
 updateViewportSize(e);
-if(frozen())
+if(frozen()) {
 updateFrozenImage();
-}
+//    if(m_frozenPixmap && (m_frozenPixmap->size() != this->size())) {
+//        QTimer::singleShot(50, this, SLOT(updateFrozenImage()));
-void GWebContentViewWidget::contextMenuEvent(::QGraphicsSceneContextMenuEvent *event) {
+//    }
-QWebHitTestResult hitTest = page()->currentFrame()->hitTestContent(event->pos().toPoint());
+}
-qDebug() << "GWebContentViewWidget::contextMenuEvent:"
+}
-<< "\n\t pos=" << hitTest.pos()
-<< "\n\t linkUrl=" << hitTest.linkUrl()
+void GWebContentViewWidget::onLongPressEvent(QPoint pos) {
-<< "\n\t imageUrl=" << hitTest.imageUrl();
+QWebHitTestResult hitTest = page()->currentFrame()->hitTestContent(pos);
+//qDebug() << "GWebContentViewWidget::contextMenuEvent:"
-WebViewEventContext *context =
+//        << "\n\t pos=" << hitTest.pos()
-new WebViewEventContext(view()->type(), hitTest);
+//        << "\n\t linkUrl=" << hitTest.linkUrl()
+//        << "\n\t imageUrl=" << hitTest.imageUrl();
+::WebViewEventContext *context =
+new ::WebViewEventContext(view()->type(), hitTest);
 if (m_webContentView && m_webContentView->currentPageIsSuperPage()) {
 // Let the superpage handle the event.
 m_webContentView->currentSuperPage()->onContextEvent(context);
 }
 else {
 // Send the event directly.
 emit contextEvent(context);
 }
+}
+void GWebContentViewWidget::contextMenuEvent(::QGraphicsSceneContextMenuEvent *event) {
+// Ignore.  The touch navigation code handles long presses.
 event->accept();
 }
 void GWebContentViewWidget::setZoomFactor(qreal zoom)
 {
 setPageZoomFactor(zoom);
 }
 void GWebContentViewWidget::setPageZoomFactor(qreal zoom)
 {
 //not zooming if it's bookmark or historyview or not a page
 if (!page() ||
 	  	(m_webContentView->type() == "webView" &&
 m_webContentView->currentPageIsSuperPage()) )
 {
 painter->restore();
 }
 }
+if(!isEnabled()) {
+// Disabled, apply whitewash.
+ChromeEffect::paintDisabledRect(painter, option->exposedRect);
+}
 #ifdef ENABLE_PERF_TRACE
 PERF_DEBUG() << "GWebContentViewWidget::paint__end: " <<
 WrtPerfTracer::tracer()->elapsedTime(st) << "\n";
 #endif
 }
 void GWebContentViewWidget::setPage(QWebPage* pg)
 {
 if (m_wrtPage == pg) return;
-qDebug() << "GWebContentViewWidget::setPage: " << pg;
 if (m_wrtPage) {
 disconnect(page()->mainFrame(), 0, this, 0);
 m_wrtPage->setView(0);
 }
 /* Reset the webview page as well - for its internal clean up */
 //calculating the center of the widget
 QPoint widgetCenter = rect().center().toPoint();
 //find the content size before applying zoom
 QSize docSizeBeforeZoom = page()->mainFrame()->contentsSize();
-qDebug()<<"setPageCenterZoomFactor() : "<<zoom;
 setZoomFactor(zoom);
 //after applying zoom calculate the document size and document center point
 QSize docSizeAfterZoom = page()->mainFrame()->contentsSize();
 QPoint docPoint = widgetCenter + page()->mainFrame()->scrollPosition();

changeset 6	1c3b8676e58c
parent 5	0f2326c2a325
child 10	232fbd5a2dcb