X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiWorkArea.cpp;h=95cff6d5ec30f8c7d8de4903e3750115022cff16;hb=b7f6b979d0f889f08e735f35378bb20ba3788b4b;hp=6773412cb0a221b7b2153cbbabfcad051159b7d2;hpb=418bf09879dfad860e298f0f3b16d765bb1262d5;p=lyx.git diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 6773412cb0..95cff6d5ec 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -39,6 +39,7 @@ #include "LyXVC.h" #include "Text.h" #include "TextMetrics.h" +#include "Undo.h" #include "version.h" #include "graphics/GraphicsImage.h" @@ -132,26 +133,30 @@ public: x_(0), caret_width_(0) {} - void draw(QPainter & painter) + /* Draw the caret. Parameter \c horiz_offset is not 0 when there + * has been horizontal scrolling in current row + */ + void draw(QPainter & painter, int horiz_offset) { if (!rect_.isValid()) return; - int y = rect_.top(); - int l = x_ - rect_.left(); - int r = rect_.right() - x_; - int bot = rect_.bottom(); + int const x = x_ - horiz_offset; + int const y = rect_.top(); + int const l = x_ - rect_.left(); + int const r = rect_.right() - x_; + int const bot = rect_.bottom(); // draw vertical line - painter.fillRect(x_, y, caret_width_, rect_.height(), color_); + painter.fillRect(x, y, caret_width_, rect_.height(), color_); // draw RTL/LTR indication painter.setPen(color_); if (l_shape_) { if (rtl_) - painter.drawLine(x_, bot, x_ - l, bot); + painter.drawLine(x, bot, x - l, bot); else - painter.drawLine(x_, bot, x_ + caret_width_ + r, bot); + painter.drawLine(x, bot, x + caret_width_ + r, bot); } // draw completion triangle @@ -159,11 +164,11 @@ public: int m = y + rect_.height() / 2; int d = TabIndicatorWidth - 1; if (rtl_) { - painter.drawLine(x_ - 1, m - d, x_ - 1 - d, m); - painter.drawLine(x_ - 1, m + d, x_ - 1 - d, m); + painter.drawLine(x - 1, m - d, x - 1 - d, m); + painter.drawLine(x - 1, m + d, x - 1 - d, m); } else { - painter.drawLine(x_ + caret_width_, m - d, x_ + caret_width_ + d, m); - painter.drawLine(x_ + caret_width_, m + d, x_ + caret_width_ + d, m); + painter.drawLine(x + caret_width_, m - d, x + caret_width_ + d, m); + painter.drawLine(x + caret_width_, m + d, x + caret_width_ + d, m); } } } @@ -197,6 +202,7 @@ public: r = max(r, TabIndicatorWidth); } + //FIXME: LyXRC::cursor_width should be caret_width caret_width_ = lyxrc.cursor_width ? lyxrc.cursor_width : 1 + int((lyxrc.currentZoom + 50) / 200.0); @@ -208,7 +214,7 @@ public: QRect const & rect() { return rect_; } private: - /// cursor is in RTL or LTR text + /// caret is in RTL or LTR text bool rtl_; /// indication for RTL or LTR bool l_shape_; @@ -233,13 +239,27 @@ SyntheticMouseEvent::SyntheticMouseEvent() GuiWorkArea::Private::Private(GuiWorkArea * parent) -: p(parent), buffer_view_(0), lyx_view_(0), - caret_(0), caret_visible_(false), - need_resize_(false), schedule_redraw_(false), preedit_lines_(1), - pixel_ratio_(1.0), - completer_(new GuiCompleter(p, p)), dialog_mode_(false), shell_escape_(false), - read_only_(false), clean_(true), externally_modified_(false) -{ +: p(parent), buffer_view_(0), lyx_view_(0), caret_(0), + caret_visible_(false), need_resize_(false), preedit_lines_(1), + last_pixel_ratio_(1.0), completer_(new GuiCompleter(p, p)), + dialog_mode_(false), shell_escape_(false), read_only_(false), + clean_(true), externally_modified_(false) +{ +/* Qt on macOS and Wayland does not respect the + * Qt::WA_OpaquePaintEvent attribute and resets the widget backing + * store at each update. Therefore, we use our own backing store in + * these two cases. */ +#if QT_VERSION >= 0x050000 + use_backingstore_ = guiApp->platformName() == "cocoa" + || guiApp->platformName().contains("wayland"); +#else +# ifdef Q_OS_MAC + use_backingstore_ = true; +# else + use_backingstore_ = false; +# endif +#endif + int const time = QApplication::cursorFlashTime() / 2; if (time > 0) { caret_timeout_.setInterval(time); @@ -304,6 +324,7 @@ void GuiWorkArea::init() generateSyntheticMouseEvent(); }); + d->resetScreen(); // With Qt4.5 a mouse event will happen before the first paint event // so make sure that the buffer view has an up to date metrics. d->buffer_view_->resize(viewport()->width(), viewport()->height()); @@ -422,12 +443,16 @@ void GuiWorkArea::startBlinkingCaret() if (view().busy()) return; - Point p; - int h = 0; - d->buffer_view_->cursorPosAndHeight(p, h); - // Don't start blinking if the cursor isn't on screen. - if (!d->buffer_view_->cursorInView(p, h)) - return; + // we cannot update geometry if not ready and we do not need to if + // caret is not in view. + if (!d->buffer_view_->buffer().undo().activeUndoGroup()) { + Point p; + int h = 0; + d->buffer_view_->caretPosAndHeight(p, h); + // Don't start blinking if the cursor isn't on screen. + if (!d->buffer_view_->cursorInView(p, h)) + return; + } d->showCaret(); @@ -449,7 +474,7 @@ void GuiWorkArea::toggleCaret() } -void GuiWorkArea::redraw(bool update_metrics) +void GuiWorkArea::scheduleRedraw(bool update_metrics) { if (!isVisible()) // No need to redraw in this case. @@ -465,16 +490,14 @@ void GuiWorkArea::redraw(bool update_metrics) d->buffer_view_->cursor().fixIfBroken(); } - // update cursor position, because otherwise it has to wait until + // update caret position, because otherwise it has to wait until // the blinking interval is over - if (d->caret_visible_) { - d->hideCaret(); - d->showCaret(); - } + d->updateCaretGeometry(); LYXERR(Debug::WORKAREA, "WorkArea::redraw screen"); viewport()->update(); + /// FIXME: is this still true now that paintEvent does the actual painting? /// \warning: scrollbar updating *must* be done after the BufferView is drawn /// because \c BufferView::updateScrollbar() is called in \c BufferView::draw(). d->updateScrollbar(); @@ -508,7 +531,7 @@ void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod) // In order to avoid bad surprise in the middle of an operation, // we better stop the blinking caret... - // the cursor gets restarted in GuiView::restartCaret() + // the caret gets restarted in GuiView::restartCaret() stopBlinkingCaret(); guiApp->processKeySym(key, mod); } @@ -527,7 +550,7 @@ void GuiWorkArea::Private::dispatch(FuncRequest const & cmd) cmd.action() != LFUN_MOUSE_MOTION || cmd.button() != mouse_button::none; // In order to avoid bad surprise in the middle of an operation, we better stop - // the blinking cursor. + // the blinking caret. if (notJustMovingTheMouse) p->stopBlinkingCaret(); @@ -549,7 +572,7 @@ void GuiWorkArea::Private::dispatch(FuncRequest const & cmd) // FIXME: let GuiView take care of those. lyx_view_->clearMessage(); - // Show the cursor immediately after any operation + // Show the caret immediately after any operation p->startBlinkingCaret(); } @@ -567,12 +590,12 @@ void GuiWorkArea::Private::resizeBufferView() Point point; int h = 0; - buffer_view_->cursorPosAndHeight(point, h); + buffer_view_->caretPosAndHeight(point, h); bool const caret_in_view = buffer_view_->cursorInView(point, h); buffer_view_->resize(p->viewport()->width(), p->viewport()->height()); if (caret_in_view) buffer_view_->scrollToCursor(); - p->viewport()->update(); + updateCaretGeometry(); // Update scrollbars which might have changed due different // BufferView dimension. This is especially important when the @@ -582,22 +605,24 @@ void GuiWorkArea::Private::resizeBufferView() need_resize_ = false; p->busy(false); - // Eventually, restart the cursor after the resize event. + // Eventually, restart the caret after the resize event. // We might be resizing even if the focus is on another widget so we only - // restart the cursor if we have the focus. + // restart the caret if we have the focus. if (p->hasFocus()) QTimer::singleShot(50, p, SLOT(startBlinkingCaret())); } -void GuiWorkArea::Private::showCaret() +void GuiWorkArea::Private::updateCaretGeometry() { - if (caret_visible_) + // we cannot update geometry if not ready and we do not need to if + // caret is not in view. + if (buffer_view_->buffer().undo().activeUndoGroup()) return; Point point; int h = 0; - buffer_view_->cursorPosAndHeight(point, h); + buffer_view_->caretPosAndHeight(point, h); if (!buffer_view_->cursorInView(point, h)) return; @@ -615,7 +640,7 @@ void GuiWorkArea::Private::showCaret() if (realfont.language() == latex_language) l_shape = false; - // show cursor on screen + // show caret on screen Cursor & cur = buffer_view_->cursor(); bool completable = cur.inset().showCompletionCursor() && completer_->completionAvailable() @@ -623,26 +648,17 @@ void GuiWorkArea::Private::showCaret() && !completer_->inlineVisible(); caret_visible_ = true; - //int cur_x = buffer_view_->getPos(cur).x_; - // We may have decided to slide the cursor row so that cursor - // is visible. - point.x_ -= buffer_view_->horizScrollOffset(); - caret_->update(point.x_, point.y_, h, l_shape, isrtl, completable); +} - if (schedule_redraw_) { - // This happens when a graphic conversion is finished. As we don't know - // the size of the new graphics, it's better the update everything. - // We can't use redraw() here because this would trigger a infinite - // recursive loop with showCaret(). - buffer_view_->resize(p->viewport()->width(), p->viewport()->height()); - p->viewport()->update(); - updateScrollbar(); - schedule_redraw_ = false; + +void GuiWorkArea::Private::showCaret() +{ + if (caret_visible_) return; - } - p->viewport()->update(caret_->rect()); + updateCaretGeometry(); + p->viewport()->update(); } @@ -653,7 +669,7 @@ void GuiWorkArea::Private::hideCaret() caret_visible_ = false; //if (!qApp->focusWidget()) - p->viewport()->update(caret_->rect()); + p->viewport()->update(); } @@ -684,7 +700,7 @@ void GuiWorkArea::scrollTo(int value) // FIXME: let GuiView take care of those. d->lyx_view_->updateLayoutList(); } - // Show the cursor immediately after any operation. + // Show the caret immediately after any operation. startBlinkingCaret(); // FIXME QT5 #ifdef Q_WS_X11 @@ -903,7 +919,23 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev) { // Wheel rotation by one notch results in a delta() of 120 (see // documentation of QWheelEvent) + // But first we have to ignore horizontal scroll events. +#if QT_VERSION < 0x050000 + if (ev->orientation() == Qt::Horizontal) { + ev->accept(); + return; + } double const delta = ev->delta() / 120.0; +#else + QPoint const aDelta = ev->angleDelta(); + // skip horizontal wheel event + if (abs(aDelta.x()) > abs(aDelta.y())) { + ev->accept(); + return; + } + double const delta = aDelta.y() / 120.0; +#endif + bool zoom = false; switch (lyxrc.scroll_wheel_zoom) { case LyXRC::SCROLL_WHEEL_ZOOM_CTRL: @@ -1162,105 +1194,31 @@ void GuiWorkArea::resizeEvent(QResizeEvent * ev) } -void GuiWorkArea::paintEvent(QPaintEvent * ev) -{ - // LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x() - // << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height()); - - if (d->needResize()) { - d->resizeBufferView(); - if (d->caret_visible_) { - d->hideCaret(); - d->showCaret(); - } - } - - GuiPainter pain(viewport(), pixelRatio()); - d->buffer_view_->draw(pain, d->caret_visible_); - - if (d->caret_visible_) - d->caret_->draw(pain); - ev->accept(); -} - - -void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) +void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain) { -//FIXME Broken Feature !! -// I do not think that we are supposed to paint inside this event. Shall we -// just let TextMetrics::breakRow add this to the relevant Row object? -#if 0 - QString const & commit_string = e->commitString(); - docstring const & preedit_string - = qstring_to_ucs4(e->preeditString()); - - if (!commit_string.isEmpty()) { - - LYXERR(Debug::KEY, "preeditString: " << e->preeditString() - << " commitString: " << e->commitString()); - - int key = 0; - - // FIXME Iwami 04/01/07: we should take care also of UTF16 surrogates here. - for (int i = 0; i != commit_string.size(); ++i) { - QKeyEvent ev(QEvent::KeyPress, key, Qt::NoModifier, commit_string[i]); - keyPressEvent(&ev); - } - } - - // Hide the cursor during the kana-kanji transformation. - if (preedit_string.empty()) - startBlinkingCaret(); - else - stopBlinkingCaret(); - - // last_width : for checking if last preedit string was/wasn't empty. - // FIXME THREAD && FIXME - // We could have more than one work area, right? - static bool last_width = false; - if (!last_width && preedit_string.empty()) { - // if last_width is last length of preedit string. - e->accept(); + if (preedit_string_.empty()) return; - } - d->buffer_view_->updateMetrics(); - viewport()->update(); // FIXME: shall we use real_current_font here? (see #10478) - FontInfo font = d->buffer_view_->cursor().getFont().fontInfo(); + FontInfo const font = buffer_view_->cursor().getFont().fontInfo(); FontMetrics const & fm = theFontMetrics(font); - int height = fm.maxHeight(); - int cur_x = d->caret_->rect().left(); - int cur_y = d->caret_->rect().bottom(); - - // redraw area of preedit string. - viewport()->update(0, cur_y - height, viewport()->width(), - (height + 1) * d->preedit_lines_); - - if (preedit_string.empty()) { - last_width = false; - d->preedit_lines_ = 1; - e->accept(); - return; - } - last_width = true; - - // att : stores an IM attribute. - QList const & att = e->attributes(); + int const height = fm.maxHeight(); + int cur_x = caret_->rect().left(); + int cur_y = caret_->rect().bottom(); // get attributes of input method cursor. // cursor_pos : cursor position in preedit string. size_t cursor_pos = 0; - bool caret_is_visible = false; - for (int i = 0; i != att.size(); ++i) { - if (att.at(i).type == QInputMethodEvent::Cursor) { - cursor_pos = att.at(i).start; - cursor_is_visible = att.at(i).length != 0; + bool cursor_is_visible = false; + for (auto const & attr : preedit_attr_) { + if (attr.type == QInputMethodEvent::Cursor) { + cursor_pos = attr.start; + cursor_is_visible = attr.length != 0; break; } } - size_t preedit_length = preedit_string.length(); + size_t const preedit_length = preedit_string_.length(); // get position of selection in input method. // FIXME: isn't there a way to do this simplier? @@ -1269,12 +1227,12 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) // rLength : selected string length in IM. size_t rLength = 0; if (cursor_pos < preedit_length) { - for (int i = 0; i != att.size(); ++i) { - if (att.at(i).type == QInputMethodEvent::TextFormat) { - if (att.at(i).start <= int(cursor_pos) - && int(cursor_pos) < att.at(i).start + att.at(i).length) { - rStart = att.at(i).start; - rLength = att.at(i).length; + for (auto const & attr : preedit_attr_) { + if (attr.type == QInputMethodEvent::TextFormat) { + if (attr.start <= int(cursor_pos) + && int(cursor_pos) < attr.start + attr.length) { + rStart = attr.start; + rLength = attr.length; if (!cursor_is_visible) cursor_pos += rLength; break; @@ -1287,20 +1245,20 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) rLength = 0; } - int const right_margin = d->buffer_view_->rightMargin(); + int const right_margin = buffer_view_->rightMargin(); Painter::preedit_style ps; // Most often there would be only one line: - d->preedit_lines_ = 1; + preedit_lines_ = 1; for (size_t pos = 0; pos != preedit_length; ++pos) { - char_type const typed_char = preedit_string[pos]; + char_type const typed_char = preedit_string_[pos]; // reset preedit string style ps = Painter::preedit_default; // if we reached the right extremity of the screen, go to next line. - if (cur_x + fm.width(typed_char) > viewport()->width() - right_margin) { + if (cur_x + fm.width(typed_char) > p->viewport()->width() - right_margin) { cur_x = right_margin; cur_y += height + 1; - ++d->preedit_lines_; + ++preedit_lines_; } // preedit strings are displayed with dashed underline // and partial strings are displayed white on black indicating @@ -1317,14 +1275,133 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) ps = Painter::preedit_cursor; // draw one character and update cur_x. - GuiPainter pain(d->screen_, pixelRatio()); cur_x += pain.preeditText(cur_x, cur_y, typed_char, font, ps); } +} + + +void GuiWorkArea::Private::resetScreen() +{ + if (use_backingstore_) { + int const pr = p->pixelRatio(); + screen_ = QImage(static_cast(pr * p->viewport()->width()), + static_cast(pr * p->viewport()->height()), + QImage::Format_ARGB32_Premultiplied); +# if QT_VERSION >= 0x050000 + screen_.setDevicePixelRatio(pr); +# endif + } +} + - // update the preedit string screen area. - viewport()->update(0, cur_y - d->preedit_lines_*height, viewport()->width(), +QPaintDevice * GuiWorkArea::Private::screenDevice() +{ + if (use_backingstore_) + return &screen_; + else + return p->viewport(); +} + + +void GuiWorkArea::Private::updateScreen(QRectF const & rc) +{ + if (use_backingstore_) { + QPainter qpain(p->viewport()); + double const pr = p->pixelRatio(); + QRectF const rcs = QRectF(rc.x() * pr, rc.y() * pr, + rc.width() * pr, rc.height() * pr); + qpain.drawImage(rc, screen_, rcs); + } +} + + +void GuiWorkArea::paintEvent(QPaintEvent * ev) +{ + // Do not trigger the painting machinery if we are not ready (see + // bug #10989). The second test triggers when in the middle of a + // dispatch operation. + if (view().busy() || d->buffer_view_->buffer().undo().activeUndoGroup()) { + // Since macOS has turned the screen black at this point, our + // backing store has to be copied to screen (this is a no-op + // except on macOS). + d->updateScreen(ev->rect()); + // Ignore this paint event, but request a new one for later. + viewport()->update(ev->rect()); + ev->accept(); + return; + } + + // LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x() + // << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height()); + + if (d->need_resize_ || pixelRatio() != d->last_pixel_ratio_) { + d->resetScreen(); + d->resizeBufferView(); + } + + d->last_pixel_ratio_ = pixelRatio(); + + GuiPainter pain(d->screenDevice(), pixelRatio()); + + d->buffer_view_->draw(pain, d->caret_visible_); + + // The preedit text, if needed + d->paintPreeditText(pain); + + // and the caret + if (d->caret_visible_) + d->caret_->draw(pain, d->buffer_view_->horizScrollOffset()); + + d->updateScreen(ev->rect()); + + ev->accept(); +} + + +void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) +{ + LYXERR(Debug::KEY, "preeditString: " << e->preeditString() + << " commitString: " << e->commitString()); + + // insert the processed text in the document (handles undo) + if (!e->commitString().isEmpty()) { + FuncRequest cmd(LFUN_SELF_INSERT, + qstring_to_ucs4(e->commitString()), + FuncRequest::KEYBOARD); + dispatch(cmd); + // FIXME: this is supposed to remove traces from preedit + // string. Can we avoid calling it explicitely? + d->buffer_view_->updateMetrics(); + } + + // Hide the caret during the test transformation. + if (e->preeditString().isEmpty()) + startBlinkingCaret(); + else + stopBlinkingCaret(); + + if (d->preedit_string_.empty() && e->preeditString().isEmpty()) { + // Nothing to do + e->accept(); + return; + } + + // The preedit text and its attributes will be used in paintPreeditText + d->preedit_string_ = qstring_to_ucs4(e->preeditString()); + d->preedit_attr_ = e->attributes(); + + + // redraw area of preedit string. + int height = d->caret_->rect().height(); + int cur_y = d->caret_->rect().bottom(); + viewport()->update(0, cur_y - height, viewport()->width(), (height + 1) * d->preedit_lines_); -#endif + + if (d->preedit_string_.empty()) { + d->preedit_lines_ = 1; + e->accept(); + return; + } // Don't forget to accept the event! e->accept(); @@ -1343,7 +1420,7 @@ QVariant GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const cur_r.moveLeft(10); cur_r.moveBottom(cur_r.bottom() + cur_r.height() * (d->preedit_lines_ - 1)); - // return lower right of cursor in LyX. + // return lower right of caret in LyX. return cur_r; default: return QWidget::inputMethodQuery(query); @@ -1377,12 +1454,6 @@ bool GuiWorkArea::isFullScreen() const } -void GuiWorkArea::scheduleRedraw() -{ - d->schedule_redraw_ = true; -} - - bool GuiWorkArea::inDialogMode() const { return d->dialog_mode_; @@ -1539,19 +1610,19 @@ TabWorkArea::TabWorkArea(QWidget * parent) this, SLOT(closeCurrentBuffer())); setCornerWidget(closeBufferButton, Qt::TopRightCorner); - // setup drag'n'drop - QTabBar* tb = new DragTabBar; - connect(tb, SIGNAL(tabMoveRequested(int, int)), - this, SLOT(moveTab(int, int))); + // set TabBar behaviour + QTabBar * tb = tabBar(); + tb->setTabsClosable(!lyxrc.single_close_tab_button); + tb->setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab); tb->setElideMode(Qt::ElideNone); - setTabBar(tb); - + // allow dragging tabs + tb->setMovable(true); // make us responsible for the context menu of the tabbar tb->setContextMenuPolicy(Qt::CustomContextMenu); connect(tb, SIGNAL(customContextMenuRequested(const QPoint &)), - this, SLOT(showContextMenu(const QPoint &))); + this, SLOT(showContextMenu(const QPoint &))); connect(tb, SIGNAL(tabCloseRequested(int)), - this, SLOT(closeTab(int))); + this, SLOT(closeTab(int))); setUsesScrollButtons(true); } @@ -1795,7 +1866,7 @@ void TabWorkArea::on_currentTabChanged(int i) GuiWorkArea * wa = workArea(i); LASSERT(wa, return); wa->setUpdatesEnabled(true); - wa->redraw(true); + wa->scheduleRedraw(true); wa->setFocus(); /// currentWorkAreaChanged(wa); @@ -2066,7 +2137,7 @@ void TabWorkArea::updateTabTexts() void TabWorkArea::showContextMenu(const QPoint & pos) { // which tab? - clicked_tab_ = static_cast(tabBar())->tabAt(pos); + clicked_tab_ = tabBar()->tabAt(pos); if (clicked_tab_ == -1) return; @@ -2095,84 +2166,6 @@ void TabWorkArea::moveTab(int fromIndex, int toIndex) } -DragTabBar::DragTabBar(QWidget* parent) - : QTabBar(parent) -{ - setAcceptDrops(true); - setTabsClosable(!lyxrc.single_close_tab_button); -} - - -void DragTabBar::mousePressEvent(QMouseEvent * event) -{ - if (event->button() == Qt::LeftButton) - dragStartPos_ = event->pos(); - QTabBar::mousePressEvent(event); -} - - -void DragTabBar::mouseMoveEvent(QMouseEvent * event) -{ - // If the left button isn't pressed anymore then return - if (!(event->buttons() & Qt::LeftButton)) - return; - - // If the distance is too small then return - if ((event->pos() - dragStartPos_).manhattanLength() - < QApplication::startDragDistance()) - return; - - // did we hit something after all? - int tab = tabAt(dragStartPos_); - if (tab == -1) - return; - - // simulate button release to remove highlight from button - int i = currentIndex(); - QMouseEvent me(QEvent::MouseButtonRelease, dragStartPos_, - event->button(), event->buttons(), 0); - QTabBar::mouseReleaseEvent(&me); - setCurrentIndex(i); - - // initiate Drag - QDrag * drag = new QDrag(this); - QMimeData * mimeData = new QMimeData; - // a crude way to distinguish tab-reodering drops from other ones - mimeData->setData("action", "tab-reordering") ; - drag->setMimeData(mimeData); - - // get tab pixmap as cursor - QRect r = tabRect(tab); - QPixmap pixmap(r.size()); - render(&pixmap, - r.topLeft()); - drag->setPixmap(pixmap); - drag->exec(); -} - - -void DragTabBar::dragEnterEvent(QDragEnterEvent * event) -{ - // Only accept if it's an tab-reordering request - QMimeData const * m = event->mimeData(); - QStringList formats = m->formats(); - if (formats.contains("action") - && m->data("action") == "tab-reordering") - event->acceptProposedAction(); -} - - -void DragTabBar::dropEvent(QDropEvent * event) -{ - int fromIndex = tabAt(dragStartPos_); - int toIndex = tabAt(event->pos()); - - // Tell interested objects that - if (fromIndex != toIndex) - tabMoveRequested(fromIndex, toIndex); - event->acceptProposedAction(); -} - - GuiWorkAreaContainer::GuiWorkAreaContainer(GuiWorkArea * wa, QWidget * parent) : QWidget(parent), wa_(wa) {