#include <config.h>
#include "GuiWorkArea.h"
+#include "GuiWorkArea_Private.h"
#include "ColorCache.h"
#include "FontLoader.h"
#include "GuiView.h"
#include "KeySymbol.h"
#include "Language.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "LyXRC.h"
#include "LyXVC.h"
-#include "MetricsInfo.h"
#include "qt_helpers.h"
#include "Text.h"
+#include "TextMetrics.h"
#include "version.h"
#include "graphics/GraphicsImage.h"
#include "support/debug.h"
#include "support/gettext.h"
#include "support/FileName.h"
+#include "support/lassert.h"
#include "frontends/Application.h"
#include "frontends/FontMetrics.h"
#include <QToolTip>
#include <QMenuBar>
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <cmath>
-#ifdef Q_WS_X11
-#include <QX11Info>
-extern "C" int XEventsQueued(Display *display, int mode);
-#endif
-
-#ifdef Q_WS_WIN
-int const CursorWidth = 2;
-#else
-int const CursorWidth = 1;
-#endif
int const TabIndicatorWidth = 3;
#undef KeyPress
class CursorWidget {
public:
- CursorWidget() {}
+ CursorWidget() {
+ recomputeWidth();
+ }
void draw(QPainter & painter)
{
int r = rect_.right() - x_;
int bot = rect_.bottom();
- // draw vertica linel
- painter.fillRect(x_, y, CursorWidth, rect_.height(), color_);
+ // draw vertical line
+ painter.fillRect(x_, y, cursor_width_, rect_.height(), color_);
// draw RTL/LTR indication
painter.setPen(color_);
if (rtl_)
painter.drawLine(x_, bot, x_ - l, bot);
else
- painter.drawLine(x_, bot, x_ + CursorWidth + r, bot);
+ painter.drawLine(x_, bot, x_ + cursor_width_ + r, bot);
}
// draw completion triangle
painter.drawLine(x_ - 1, m - d, x_ - 1 - d, m);
painter.drawLine(x_ - 1, m + d, x_ - 1 - d, m);
} else {
- painter.drawLine(x_ + CursorWidth, m - d, x_ + CursorWidth + d, m);
- painter.drawLine(x_ + CursorWidth, m + d, x_ + CursorWidth + d, m);
+ painter.drawLine(x_ + cursor_width_, m - d, x_ + cursor_width_ + d, m);
+ painter.drawLine(x_ + cursor_width_, m + d, x_ + cursor_width_ + d, m);
}
}
}
}
// compute overall rectangle
- rect_ = QRect(x - l, y, CursorWidth + r + l, h);
+ rect_ = QRect(x - l, y, cursor_width_ + r + l, h);
}
void show(bool set_show = true) { show_ = set_show; }
void hide() { show_ = false; }
+ int cursorWidth() const { return cursor_width_; }
+ void recomputeWidth() {
+ cursor_width_ = lyxrc.cursor_width
+ ? lyxrc.cursor_width
+ : 1 + int((lyxrc.zoom + 50) / 200.0);
+ }
QRect const & rect() { return rect_; }
QRect rect_;
/// x position (were the vertical line is drawn)
int x_;
+
+ int cursor_width_;
};
// This is a 'heartbeat' generating synthetic mouse move events when the
// cursor is at the top or bottom edge of the viewport. One scroll per 0.2 s
SyntheticMouseEvent::SyntheticMouseEvent()
- : timeout(200), restart_timeout(true),
- x_old(-1), y_old(-1), min_scrollbar_old(-1.0), max_scrollbar_old(-1.0)
+ : timeout(200), restart_timeout(true)
{}
-GuiWorkArea::GuiWorkArea(QWidget *)
- : buffer_view_(0), lyx_view_(0),
- cursor_visible_(false),
- need_resize_(false), schedule_redraw_(false),
- preedit_lines_(1), completer_(new GuiCompleter(this))
+GuiWorkArea::Private::Private(GuiWorkArea * parent)
+: p(parent), screen_(0), buffer_view_(0), lyx_view_(0), cursor_visible_(false),
+need_resize_(false), schedule_redraw_(false), preedit_lines_(1),
+completer_(new GuiCompleter(p, p))
+{
+}
+
+
+GuiWorkArea::GuiWorkArea(QWidget * /* w */)
+: d(new Private(this))
{
}
GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & gv)
- : buffer_view_(0), lyx_view_(0),
- cursor_visible_(false),
- need_resize_(false), schedule_redraw_(false),
- preedit_lines_(1), completer_(new GuiCompleter(this))
+: d(new Private(this))
{
setGuiView(gv);
setBuffer(buffer);
void GuiWorkArea::init()
{
// Setup the signals
- connect(&cursor_timeout_, SIGNAL(timeout()),
+ connect(&d->cursor_timeout_, SIGNAL(timeout()),
this, SLOT(toggleCursor()));
int const time = QApplication::cursorFlashTime() / 2;
if (time > 0) {
- cursor_timeout_.setInterval(time);
- cursor_timeout_.start();
+ d->cursor_timeout_.setInterval(time);
+ d->cursor_timeout_.start();
} else {
// let's initialize this just to be safe
- cursor_timeout_.setInterval(500);
+ d->cursor_timeout_.setInterval(500);
}
- screen_ = QPixmap(viewport()->width(), viewport()->height());
+ 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.
- buffer_view_->resize(viewport()->width(), viewport()->height());
- cursor_ = new frontend::CursorWidget();
- cursor_->hide();
+ d->buffer_view_->resize(viewport()->width(), viewport()->height());
+ d->cursor_ = new frontend::CursorWidget();
+ d->cursor_->hide();
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setAcceptDrops(true);
setFocusPolicy(Qt::StrongFocus);
- viewport()->setCursor(Qt::IBeamCursor);
+ d->setCursorShape(Qt::IBeamCursor);
- synthetic_mouse_event_.timeout.timeout.connect(
- boost::bind(&GuiWorkArea::generateSyntheticMouseEvent,
+ d->synthetic_mouse_event_.timeout.timeout.connect(
+ bind(&GuiWorkArea::generateSyntheticMouseEvent,
this));
// Initialize the vertical Scroll Bar
// Must be set when creating custom text editing widgets.
setAttribute(Qt::WA_InputMethodEnabled, true);
- dialog_mode_ = false;
+ d->dialog_mode_ = false;
}
GuiWorkArea::~GuiWorkArea()
{
- buffer_view_->buffer().workAreaManager().remove(this);
- delete buffer_view_;
- delete cursor_;
+ d->buffer_view_->buffer().workAreaManager().remove(this);
+ delete d->screen_;
+ delete d->buffer_view_;
+ delete d->cursor_;
// Completer has a QObject parent and is thus automatically destroyed.
+ // See #4758.
// delete completer_;
+ delete d;
+}
+
+
+Qt::CursorShape GuiWorkArea::cursorShape() const
+{
+ return viewport()->cursor().shape();
+}
+
+
+void GuiWorkArea::Private::setCursorShape(Qt::CursorShape shape)
+{
+ p->viewport()->setCursor(shape);
+}
+
+
+void GuiWorkArea::Private::updateCursorShape()
+{
+ setCursorShape(buffer_view_->clickableInset()
+ ? Qt::PointingHandCursor : Qt::IBeamCursor);
}
void GuiWorkArea::setGuiView(GuiView & gv)
{
- lyx_view_ = &gv;
+ d->lyx_view_ = &gv;
}
void GuiWorkArea::setBuffer(Buffer & buffer)
{
- delete buffer_view_;
- buffer_view_ = new BufferView(buffer),
+ delete d->buffer_view_;
+ d->buffer_view_ = new BufferView(buffer);
buffer.workAreaManager().add(this);
// HACK: Prevents an additional redraw when the scrollbar pops up
void GuiWorkArea::close()
{
- lyx_view_->removeWorkArea(this);
+ d->lyx_view_->removeWorkArea(this);
}
void GuiWorkArea::setFullScreen(bool full_screen)
{
- buffer_view_->setFullScreen(full_screen);
+ d->buffer_view_->setFullScreen(full_screen);
setFrameStyle(QFrame::NoFrame);
if (full_screen) {
setFrameStyle(QFrame::NoFrame);
BufferView & GuiWorkArea::bufferView()
{
- return *buffer_view_;
+ return *d->buffer_view_;
}
BufferView const & GuiWorkArea::bufferView() const
{
- return *buffer_view_;
+ return *d->buffer_view_;
}
void GuiWorkArea::stopBlinkingCursor()
{
- cursor_timeout_.stop();
- hideCursor();
+ d->cursor_timeout_.stop();
+ d->hideCursor();
}
void GuiWorkArea::startBlinkingCursor()
{
- showCursor();
+ // do not show the cursor if the view is busy
+ 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;
+
+ d->showCursor();
+
//we're not supposed to cache this value.
int const time = QApplication::cursorFlashTime() / 2;
if (time <= 0)
return;
- cursor_timeout_.setInterval(time);
- cursor_timeout_.start();
+ d->cursor_timeout_.setInterval(time);
+ d->cursor_timeout_.start();
}
-void GuiWorkArea::redraw()
+void GuiWorkArea::redraw(bool update_metrics)
{
if (!isVisible())
// No need to redraw in this case.
// No need to do anything if this is the current view. The BufferView
// metrics are already up to date.
- if (lyx_view_ != guiApp->currentView()
- || lyx_view_->currentWorkArea() != this) {
+ if (update_metrics || d->lyx_view_ != guiApp->currentView()
+ || d->lyx_view_->currentWorkArea() != this) {
// FIXME: it would be nice to optimize for the off-screen case.
- buffer_view_->updateMetrics();
- buffer_view_->cursor().fixIfBroken();
+ d->buffer_view_->cursor().fixIfBroken();
+ d->buffer_view_->updateMetrics();
+ d->buffer_view_->cursor().fixIfBroken();
}
// update cursor position, because otherwise it has to wait until
// the blinking interval is over
- if (cursor_visible_) {
- hideCursor();
- showCursor();
+ if (d->cursor_visible_) {
+ d->hideCursor();
+ d->showCursor();
}
LYXERR(Debug::WORKAREA, "WorkArea::redraw screen");
- updateScreen();
+ d->updateScreen();
update(0, 0, viewport()->width(), viewport()->height());
/// \warning: scrollbar updating *must* be done after the BufferView is drawn
/// because \c BufferView::updateScrollbar() is called in \c BufferView::draw().
- updateScrollbar();
- lyx_view_->updateStatusBar();
+ d->updateScrollbar();
+ d->lyx_view_->updateStatusBar();
if (lyxerr.debugging(Debug::WORKAREA))
- buffer_view_->coordCache().dump();
+ d->buffer_view_->coordCache().dump();
+
+ updateWindowTitle();
+
+ d->updateCursorShape();
}
void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod)
{
- if (lyx_view_->isFullScreen() && lyx_view_->menuBar()->isVisible()
+ if (d->lyx_view_->isFullScreen() && d->lyx_view_->menuBar()->isVisible()
&& lyxrc.full_screen_menubar) {
// FIXME HACK: we should not have to do this here. See related comment
// in GuiView::event() (QEvent::ShortcutOverride)
- lyx_view_->menuBar()->hide();
+ d->lyx_view_->menuBar()->hide();
}
// In order to avoid bad surprise in the middle of an operation,
// we better stop the blinking cursor...
// the cursor gets restarted in GuiView::restartCursor()
stopBlinkingCursor();
-
- theLyXFunc().setLyXView(lyx_view_);
- theLyXFunc().processKeySym(key, mod);
+ guiApp->processKeySym(key, mod);
}
-void GuiWorkArea::dispatch(FuncRequest const & cmd0, KeyModifier mod)
+void GuiWorkArea::Private::dispatch(FuncRequest const & cmd0, KeyModifier mod)
{
// Handle drag&drop
- if (cmd0.action == LFUN_FILE_OPEN) {
- lyx_view_->dispatch(cmd0);
+ if (cmd0.action() == LFUN_FILE_OPEN) {
+ DispatchResult dr;
+ lyx_view_->dispatch(cmd0, dr);
return;
}
- theLyXFunc().setLyXView(lyx_view_);
-
FuncRequest cmd;
- if (cmd0.action == LFUN_MOUSE_PRESS) {
+ if (cmd0.action() == LFUN_MOUSE_PRESS) {
if (mod == ShiftModifier)
cmd = FuncRequest(cmd0, "region-select");
else if (mod == ControlModifier)
cmd = cmd0;
bool const notJustMovingTheMouse =
- cmd.action != LFUN_MOUSE_MOTION || cmd.button() != mouse_button::none;
+ 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.
if (notJustMovingTheMouse)
- stopBlinkingCursor();
+ p->stopBlinkingCursor();
buffer_view_->mouseEventDispatch(cmd);
// Skip these when selecting
- if (cmd.action != LFUN_MOUSE_MOTION) {
+ // FIXME: let GuiView take care of those.
+ if (cmd.action() != LFUN_MOUSE_MOTION) {
completer_->updateVisibility(false, false);
lyx_view_->updateDialogs();
lyx_view_->updateStatusBar();
// Slight hack: this is only called currently when we
// clicked somewhere, so we force through the display
// of the new status here.
+ // FIXME: let GuiView take care of those.
lyx_view_->clearMessage();
// Show the cursor immediately after any operation
- startBlinkingCursor();
+ p->startBlinkingCursor();
}
+
+ updateCursorShape();
}
-void GuiWorkArea::resizeBufferView()
+void GuiWorkArea::Private::resizeBufferView()
{
// WARNING: Please don't put any code that will trigger a repaint here!
// We are already inside a paint event.
- lyx_view_->setBusy(true);
- Point p;
+ p->stopBlinkingCursor();
+ // Warn our container (GuiView).
+ p->busy(true);
+
+ Point point;
int h = 0;
- buffer_view_->cursorPosAndHeight(p, h);
- bool const cursor_in_view = buffer_view_->cursorInView(p, h);
- buffer_view_->resize(viewport()->width(), viewport()->height());
+ buffer_view_->cursorPosAndHeight(point, h);
+ bool const cursor_in_view = buffer_view_->cursorInView(point, h);
+ buffer_view_->resize(p->viewport()->width(), p->viewport()->height());
if (cursor_in_view)
buffer_view_->scrollToCursor();
updateScreen();
// as the scrollbar paramters are then set for the first time.
updateScrollbar();
- lyx_view_->updateLayoutList();
- lyx_view_->setBusy(false);
need_resize_ = false;
+ p->busy(false);
+ // Eventually, restart the cursor 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.
+ if (p->hasFocus())
+ QTimer::singleShot(50, p, SLOT(startBlinkingCursor()));
}
-void GuiWorkArea::showCursor()
+void GuiWorkArea::Private::showCursor()
{
if (cursor_visible_)
return;
+ Point p;
+ int h = 0;
+ buffer_view_->cursorPosAndHeight(p, h);
+ if (!buffer_view_->cursorInView(p, h))
+ return;
+
// RTL or not RTL
bool l_shape = false;
Font const & realfont = buffer_view_->cursor().real_current_font;
if (realfont.language() == latex_language)
l_shape = false;
- Point p;
- int h = 0;
- buffer_view_->cursorPosAndHeight(p, h);
// show cursor on screen
Cursor & cur = buffer_view_->cursor();
bool completable = cur.inset().showCompletionCursor()
&& completer_->completionAvailable()
&& !completer_->popupVisible()
&& !completer_->inlineVisible();
- if (buffer_view_->cursorInView(p, h)) {
- cursor_visible_ = true;
- showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
- }
+ cursor_visible_ = true;
+ cursor_->recomputeWidth();
+ showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
}
-void GuiWorkArea::hideCursor()
+void GuiWorkArea::Private::hideCursor()
{
if (!cursor_visible_)
return;
void GuiWorkArea::toggleCursor()
{
- if (cursor_visible_)
- hideCursor();
+ if (d->cursor_visible_)
+ d->hideCursor();
else
- showCursor();
+ d->showCursor();
}
-void GuiWorkArea::updateScrollbar()
+void GuiWorkArea::Private::updateScrollbar()
{
ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters();
// WARNING: don't touch at the scrollbar value like this:
// verticalScrollBar()->setValue(scroll_.position);
// because this would cause a recursive signal/slot calling with
// GuiWorkArea::scrollTo
- verticalScrollBar()->setRange(scroll_.min, scroll_.max);
- verticalScrollBar()->setPageStep(scroll_.page_step);
- verticalScrollBar()->setSingleStep(scroll_.single_step);
- verticalScrollBar()->setSliderPosition(scroll_.position);
+ p->verticalScrollBar()->setRange(scroll_.min, scroll_.max);
+ p->verticalScrollBar()->setPageStep(scroll_.page_step);
+ p->verticalScrollBar()->setSingleStep(scroll_.single_step);
+ p->verticalScrollBar()->setSliderPosition(scroll_.position);
}
void GuiWorkArea::scrollTo(int value)
{
stopBlinkingCursor();
- buffer_view_->scrollDocView(value);
+ d->buffer_view_->scrollDocView(value, true);
if (lyxrc.cursor_follows_scrollbar) {
- buffer_view_->setCursorFromScrollbar();
- lyx_view_->updateLayoutList();
+ d->buffer_view_->setCursorFromScrollbar();
+ // FIXME: let GuiView take care of those.
+ d->lyx_view_->updateLayoutList();
}
// Show the cursor immediately after any operation.
startBlinkingCursor();
if (lyxrc.use_tooltip) {
QPoint pos = helpEvent->pos();
if (pos.x() < viewport()->width()) {
- QString s = toqstr(buffer_view_->toolTip(pos.x(), pos.y()));
+ QString s = toqstr(d->buffer_view_->toolTip(pos.x(), pos.y()));
QToolTip::showText(helpEvent->globalPos(), s);
}
else
// which are otherwise reserved to focus switching between controls
// within a dialog.
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
- if ((ke->key() != Qt::Key_Tab && ke->key() != Qt::Key_Backtab)
- || ke->modifiers() & Qt::ControlModifier)
- return QAbstractScrollArea::event(e);
- keyPressEvent(ke);
- return true;
+ if ((ke->key() == Qt::Key_Tab && ke->modifiers() == Qt::NoModifier)
+ || (ke->key() == Qt::Key_Backtab && (
+ ke->modifiers() == Qt::ShiftModifier
+ || ke->modifiers() == Qt::NoModifier))) {
+ keyPressEvent(ke);
+ return true;
+ }
+ return QAbstractScrollArea::event(e);
}
default:
void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
{
- QPoint pos = e->pos();
- docstring name = buffer_view_->contextMenu(pos.x(), pos.y());
+ string name;
+ if (e->reason() == QContextMenuEvent::Mouse)
+ // the menu name is set on mouse press
+ name = d->context_menu_name_;
+ else {
+ QPoint pos = e->pos();
+ Cursor const & cur = d->buffer_view_->cursor();
+ if (e->reason() == QContextMenuEvent::Keyboard && cur.inTexted()) {
+ // Do not access the context menu of math right in front of before
+ // the cursor. This does not work when the cursor is in text.
+ Inset * inset = cur.paragraph().getInset(cur.pos());
+ if (inset && inset->asInsetMath())
+ --pos.rx();
+ else if (cur.pos() > 0) {
+ Inset * inset = cur.paragraph().getInset(cur.pos() - 1);
+ if (inset)
+ ++pos.rx();
+ }
+ }
+ name = d->buffer_view_->contextMenu(pos.x(), pos.y());
+ }
+
if (name.empty()) {
QAbstractScrollArea::contextMenuEvent(e);
return;
}
- QMenu * menu = guiApp->menus().menu(toqstr(name), *lyx_view_);
+ // always show mnemonics when the keyboard is used to show the context menu
+ // FIXME: This should be fixed in Qt itself
+ bool const keyboard = (e->reason() == QContextMenuEvent::Keyboard);
+ QMenu * menu = guiApp->menus().menu(toqstr(name), *d->lyx_view_, keyboard);
if (!menu) {
QAbstractScrollArea::contextMenuEvent(e);
return;
void GuiWorkArea::focusInEvent(QFocusEvent * e)
{
- /*
- LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << std::endl);
- GuiWorkArea * old_gwa = theGuiApp()->currentView()->currentWorkArea();
- if (old_gwa)
- old_gwa->stopBlinkingCursor();
- lyx_view_->setCurrentWorkArea(this);
- */
-
- if (lyx_view_->currentWorkArea() != this)
- lyx_view_->setCurrentWorkArea(this);
+ LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << endl);
+ if (d->lyx_view_->currentWorkArea() != this) {
+ d->lyx_view_->setCurrentWorkArea(this);
+ d->lyx_view_->currentWorkArea()->bufferView().buffer().updateBuffer();
+ }
startBlinkingCursor();
QAbstractScrollArea::focusInEvent(e);
void GuiWorkArea::focusOutEvent(QFocusEvent * e)
{
- LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << std::endl);
+ LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << endl);
stopBlinkingCursor();
QAbstractScrollArea::focusOutEvent(e);
}
void GuiWorkArea::mousePressEvent(QMouseEvent * e)
{
- if (dc_event_.active && dc_event_ == *e) {
- dc_event_.active = false;
+ if (d->dc_event_.active && d->dc_event_ == *e) {
+ d->dc_event_.active = false;
FuncRequest cmd(LFUN_MOUSE_TRIPLE, e->x(), e->y(),
q_button_state(e->button()));
- dispatch(cmd);
+ d->dispatch(cmd);
e->accept();
return;
}
FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
q_button_state(e->button()));
- dispatch(cmd, q_key_state(e->modifiers()));
+ d->dispatch(cmd, q_key_state(e->modifiers()));
+
+ // Save the context menu on mouse press, because also the mouse
+ // cursor is set on mouse press. Afterwards, we can either release
+ // the mousebutton somewhere else, or the cursor might have moved
+ // due to the DEPM. We need to do this after the mouse has been
+ // set in dispatch(), because the selection state might change.
+ if (e->button() == Qt::RightButton)
+ d->context_menu_name_ = d->buffer_view_->contextMenu(e->x(), e->y());
+
e->accept();
}
void GuiWorkArea::mouseReleaseEvent(QMouseEvent * e)
{
- if (synthetic_mouse_event_.timeout.running())
- synthetic_mouse_event_.timeout.stop();
+ if (d->synthetic_mouse_event_.timeout.running())
+ d->synthetic_mouse_event_.timeout.stop();
FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
q_button_state(e->button()));
- dispatch(cmd);
+ d->dispatch(cmd);
e->accept();
}
e->accept();
// If we're above or below the work area...
- if (e->y() <= 20 || e->y() >= viewport()->height() - 20) {
+ if ((e->y() <= 20 || e->y() >= viewport()->height() - 20)
+ && e->buttons() == mouse_button::button1) {
// Make sure only a synthetic event can cause a page scroll,
// so they come at a steady rate:
if (e->y() <= 20)
// _Force_ a scroll up:
- cmd.y = -40;
+ cmd.set_y(e->y() - 21);
else
- cmd.y = viewport()->height();
+ cmd.set_y(e->y() + 21);
// Store the event, to be handled when the timeout expires.
- synthetic_mouse_event_.cmd = cmd;
+ d->synthetic_mouse_event_.cmd = cmd;
- if (synthetic_mouse_event_.timeout.running())
+ if (d->synthetic_mouse_event_.timeout.running()) {
// Discard the event. Note that it _may_ be handled
// when the timeout expires if
// synthetic_mouse_event_.cmd has not been overwritten.
// occurred after the one used to start the timeout
// in the first place.
return;
-
- synthetic_mouse_event_.restart_timeout = true;
- synthetic_mouse_event_.timeout.start();
+ }
+
+ d->synthetic_mouse_event_.restart_timeout = true;
+ d->synthetic_mouse_event_.timeout.start();
// Fall through to handle this event...
- } else if (synthetic_mouse_event_.timeout.running()) {
+ } else if (d->synthetic_mouse_event_.timeout.running()) {
// Store the event, to be possibly handled when the timeout
// expires.
// Once the timeout has expired, normal control is returned
// to mouseMoveEvent (restart_timeout = false).
// This results in a much smoother 'feel' when moving the
// mouse back into the work area.
- synthetic_mouse_event_.cmd = cmd;
- synthetic_mouse_event_.restart_timeout = false;
- return;
- }
-
- // Has anything changed on-screen since the last QMouseEvent
- // was received?
- if (e->x() == synthetic_mouse_event_.x_old
- && e->y() == synthetic_mouse_event_.y_old
- && synthetic_mouse_event_.min_scrollbar_old == verticalScrollBar()->minimum()
- && synthetic_mouse_event_.max_scrollbar_old == verticalScrollBar()->maximum()) {
- // Nothing changed on-screen since the last QMouseEvent.
+ d->synthetic_mouse_event_.cmd = cmd;
+ d->synthetic_mouse_event_.restart_timeout = false;
return;
}
-
- // Yes something has changed. Store the params used to check this.
- synthetic_mouse_event_.x_old = e->x();
- synthetic_mouse_event_.y_old = e->y();
- synthetic_mouse_event_.min_scrollbar_old = verticalScrollBar()->minimum();
- synthetic_mouse_event_.max_scrollbar_old = verticalScrollBar()->maximum();
-
- // ... and dispatch the event to the LyX core.
- dispatch(cmd);
+ d->dispatch(cmd);
}
{
// Wheel rotation by one notch results in a delta() of 120 (see
// documentation of QWheelEvent)
- int const delta = ev->delta() / 120;
- if (ev->modifiers() & Qt::ControlModifier) {
- docstring arg = convert<docstring>(5 * delta);
+ double const delta = ev->delta() / 120.0;
+ bool zoom = false;
+ switch (lyxrc.scroll_wheel_zoom) {
+ case LyXRC::SCROLL_WHEEL_ZOOM_CTRL:
+ zoom = ev->modifiers() & Qt::ControlModifier;
+ zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::AltModifier));
+ break;
+ case LyXRC::SCROLL_WHEEL_ZOOM_SHIFT:
+ zoom = ev->modifiers() & Qt::ShiftModifier;
+ zoom &= !(ev->modifiers() & (Qt::ControlModifier | Qt::AltModifier));
+ break;
+ case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
+ zoom = ev->modifiers() & Qt::AltModifier;
+ zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier));
+ break;
+ case LyXRC::SCROLL_WHEEL_ZOOM_OFF:
+ break;
+ }
+ if (zoom) {
+ docstring arg = convert<docstring>(int(5 * delta));
lyx::dispatch(FuncRequest(LFUN_BUFFER_ZOOM_IN, arg));
return;
}
int scroll_value = lines > page_step
? page_step : lines * verticalScrollBar()->singleStep();
- // Take into account the rotation.
- scroll_value *= delta;
-
- // Take into account user preference.
- scroll_value *= lyxrc.mouse_wheel_speed;
+ // Take into account the rotation and the user preferences.
+ scroll_value = int(scroll_value * delta * lyxrc.mouse_wheel_speed);
LYXERR(Debug::SCROLLING, "wheelScrollLines = " << lines
<< " delta = " << delta << " scroll_value = " << scroll_value
<< " page_step = " << page_step);
void GuiWorkArea::generateSyntheticMouseEvent()
{
+ int const e_y = d->synthetic_mouse_event_.cmd.y();
+ int const wh = d->buffer_view_->workHeight();
+ bool const up = e_y < 0;
+ bool const down = e_y > wh;
+
// Set things off to generate the _next_ 'pseudo' event.
- if (synthetic_mouse_event_.restart_timeout)
- synthetic_mouse_event_.timeout.start();
-
- // Has anything changed on-screen since the last timeout signal
- // was received?
- int const min_scrollbar = verticalScrollBar()->minimum();
- int const max_scrollbar = verticalScrollBar()->maximum();
- if (min_scrollbar == synthetic_mouse_event_.min_scrollbar_old
- && max_scrollbar == synthetic_mouse_event_.max_scrollbar_old) {
+ int step = 50;
+ if (d->synthetic_mouse_event_.restart_timeout) {
+ // This is some magic formulae to determine the speed
+ // of scrolling related to the position of the mouse.
+ int time = 200;
+ if (up || down) {
+ int dist = up ? -e_y : e_y - wh;
+ time = max(min(200, 250000 / (dist * dist)), 1) ;
+
+ if (time < 40) {
+ step = 80000 / (time * time);
+ time = 40;
+ }
+ }
+ d->synthetic_mouse_event_.timeout.setTimeout(time);
+ d->synthetic_mouse_event_.timeout.start();
+ }
+
+ // Can we scroll further ?
+ int const value = verticalScrollBar()->value();
+ if (value == verticalScrollBar()->maximum()
+ || value == verticalScrollBar()->minimum()) {
+ d->synthetic_mouse_event_.timeout.stop();
return;
}
- // Yes it has. Store the params used to check this.
- synthetic_mouse_event_.min_scrollbar_old = min_scrollbar;
- synthetic_mouse_event_.max_scrollbar_old = max_scrollbar;
- // ... and dispatch the event to the LyX core.
- dispatch(synthetic_mouse_event_.cmd);
+
+ // Scroll
+ if (step <= 2 * wh) {
+ d->buffer_view_->scroll(up ? -step : step);
+ d->buffer_view_->updateMetrics();
+ } else {
+ d->buffer_view_->scrollDocView(value + up ? -step : step, false);
+ }
+
+ // In which paragraph do we have to set the cursor ?
+ Cursor & cur = d->buffer_view_->cursor();
+ // FIXME: we don't know howto handle math.
+ Text * text = cur.text();
+ if (!text)
+ return;
+ TextMetrics const & tm = d->buffer_view_->textMetrics(text);
+
+ pair<pit_type, const ParagraphMetrics *> pp = up ? tm.first() : tm.last();
+ ParagraphMetrics const & pm = *pp.second;
+ pit_type const pit = pp.first;
+
+ if (pm.rows().empty())
+ return;
+
+ // Find the row at which we set the cursor.
+ RowList::const_iterator rit = pm.rows().begin();
+ RowList::const_iterator rlast = pm.rows().end();
+ int yy = pm.position() - pm.ascent();
+ for (--rlast; rit != rlast; ++rit) {
+ int h = rit->height();
+ if ((up && yy + h > 0)
+ || (!up && yy + h > wh - defaultRowHeight()))
+ break;
+ yy += h;
+ }
+
+ // Find the position of the cursor
+ bool bound;
+ int x = d->synthetic_mouse_event_.cmd.x();
+ pos_type const pos = rit->pos() + tm.getColumnNearX(pit, *rit, x, bound);
+
+ // Set the cursor
+ cur.pit() = pit;
+ cur.pos() = pos;
+ cur.boundary(bound);
+
+ d->buffer_view_->buffer().changed(false);
+ return;
}
void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
{
// Do not process here some keys if dialog_mode_ is set
- if (dialog_mode_
+ if (d->dialog_mode_
&& (ev->modifiers() == Qt::NoModifier
|| ev->modifiers() == Qt::ShiftModifier)
&& (ev->key() == Qt::Key_Escape
}
// intercept some keys if completion popup is visible
- if (completer_->popupVisible()) {
+ if (d->completer_->popupVisible()) {
switch (ev->key()) {
case Qt::Key_Enter:
case Qt::Key_Return:
- completer_->activate();
+ d->completer_->activate();
ev->accept();
return;
}
// do nothing if there are other events
// (the auto repeated events come too fast)
- // \todo FIXME: remove hard coded Qt keys, process the key binding
+ // it looks like this is only needed on X11
#ifdef Q_WS_X11
- if (XEventsQueued(QX11Info::display(), 0) > 1 && ev->isAutoRepeat()
- && (Qt::Key_PageDown || Qt::Key_PageUp)) {
- LYXERR(Debug::KEY, "system is busy: scroll key event ignored");
- ev->ignore();
- return;
+ if (qApp->hasPendingEvents() && ev->isAutoRepeat()) {
+ switch (ev->key()) {
+ case Qt::Key_PageDown:
+ case Qt::Key_PageUp:
+ case Qt::Key_Left:
+ case Qt::Key_Right:
+ case Qt::Key_Up:
+ case Qt::Key_Down:
+ LYXERR(Debug::KEY, "system is busy: scroll key event ignored");
+ ev->ignore();
+ return;
+ }
}
#endif
+ KeyModifier m = q_key_state(ev->modifiers());
+
+ std::string str;
+ if (m & ShiftModifier)
+ str += "Shift-";
+ if (m & ControlModifier)
+ str += "Control-";
+ if (m & AltModifier)
+ str += "Alt-";
+ if (m & MetaModifier)
+ str += "Meta-";
+
LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text()
- << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key());
+ << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key()
+ << " keyState: " << str);
KeySymbol sym;
setKeySymbol(&sym, ev);
- processKeySym(sym, q_key_state(ev->modifiers()));
- ev->accept();
+ if (sym.isOK()) {
+ processKeySym(sym, q_key_state(ev->modifiers()));
+ ev->accept();
+ } else {
+ ev->ignore();
+ }
}
void GuiWorkArea::doubleClickTimeout()
{
- dc_event_.active = false;
+ d->dc_event_.active = false;
}
void GuiWorkArea::mouseDoubleClickEvent(QMouseEvent * ev)
{
- dc_event_ = DoubleClick(ev);
+ d->dc_event_ = DoubleClick(ev);
QTimer::singleShot(QApplication::doubleClickInterval(), this,
SLOT(doubleClickTimeout()));
FuncRequest cmd(LFUN_MOUSE_DOUBLE,
ev->x(), ev->y(),
q_button_state(ev->button()));
- dispatch(cmd);
+ d->dispatch(cmd);
ev->accept();
}
void GuiWorkArea::resizeEvent(QResizeEvent * ev)
{
QAbstractScrollArea::resizeEvent(ev);
- need_resize_ = true;
+ d->need_resize_ = true;
ev->accept();
}
-void GuiWorkArea::update(int x, int y, int w, int h)
+void GuiWorkArea::Private::update(int x, int y, int w, int h)
{
- viewport()->repaint(x, y, w, h);
+ p->viewport()->update(x, y, w, h);
}
// LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x()
// << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height());
- if (need_resize_) {
- screen_ = QPixmap(viewport()->width(), viewport()->height());
- resizeBufferView();
- hideCursor();
- showCursor();
+ if (d->need_resize_) {
+ d->resetScreen();
+ d->resizeBufferView();
+ if (d->cursor_visible_) {
+ d->hideCursor();
+ d->showCursor();
+ }
}
QPainter pain(viewport());
- pain.drawPixmap(rc, screen_, rc);
- cursor_->draw(pain);
+ if (lyxrc.use_qimage) {
+ pain.drawImage(rc, static_cast<QImage const &>(*d->screen_), rc);
+ } else {
+ pain.drawPixmap(rc, static_cast<QPixmap const &>(*d->screen_), rc);
+ }
+ d->cursor_->draw(pain);
ev->accept();
}
-void GuiWorkArea::updateScreen()
+void GuiWorkArea::Private::updateScreen()
{
- GuiPainter pain(&screen_);
+ GuiPainter pain(screen_);
buffer_view_->draw(pain);
}
-void GuiWorkArea::showCursor(int x, int y, int h,
+void GuiWorkArea::Private::showCursor(int x, int y, int h,
bool l_shape, bool rtl, bool completable)
{
if (schedule_redraw_) {
// 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 showCursor().
- buffer_view_->resize(viewport()->width(), viewport()->height());
+ buffer_view_->resize(p->viewport()->width(), p->viewport()->height());
updateScreen();
updateScrollbar();
- viewport()->update(QRect(0, 0, viewport()->width(), viewport()->height()));
+ p->viewport()->update(QRect(0, 0, p->viewport()->width(), p->viewport()->height()));
schedule_redraw_ = false;
// Show the cursor immediately after the update.
hideCursor();
- toggleCursor();
+ p->toggleCursor();
return;
}
cursor_->update(x, y, h, l_shape, rtl, completable);
cursor_->show();
- viewport()->update(cursor_->rect());
+ p->viewport()->update(cursor_->rect());
}
-void GuiWorkArea::removeCursor()
+void GuiWorkArea::Private::removeCursor()
{
cursor_->hide();
//if (!qApp->focusWidget())
- viewport()->update(cursor_->rect());
+ p->viewport()->update(cursor_->rect());
}
return;
}
- GuiPainter pain(&screen_);
- buffer_view_->updateMetrics();
- buffer_view_->draw(pain);
- FontInfo font = buffer_view_->cursor().getFont().fontInfo();
+ GuiPainter pain(d->screen_);
+ d->buffer_view_->updateMetrics();
+ d->buffer_view_->draw(pain);
+ FontInfo font = d->buffer_view_->cursor().getFont().fontInfo();
FontMetrics const & fm = theFontMetrics(font);
int height = fm.maxHeight();
- int cur_x = cursor_->rect().left();
- int cur_y = cursor_->rect().bottom();
+ int cur_x = d->cursor_->rect().left();
+ int cur_y = d->cursor_->rect().bottom();
// redraw area of preedit string.
update(0, cur_y - height, viewport()->width(),
- (height + 1) * preedit_lines_);
+ (height + 1) * d->preedit_lines_);
if (preedit_string.empty()) {
last_width = false;
- preedit_lines_ = 1;
+ d->preedit_lines_ = 1;
e->accept();
return;
}
rLength = 0;
}
- int const right_margin = buffer_view_->rightMargin();
+ int const right_margin = d->buffer_view_->rightMargin();
Painter::preedit_style ps;
// Most often there would be only one line:
- preedit_lines_ = 1;
+ d->preedit_lines_ = 1;
for (size_t pos = 0; pos != preedit_length; ++pos) {
char_type const typed_char = preedit_string[pos];
// reset preedit string style
if (cur_x + fm.width(typed_char) > viewport()->width() - right_margin) {
cur_x = right_margin;
cur_y += height + 1;
- ++preedit_lines_;
+ ++d->preedit_lines_;
}
// preedit strings are displayed with dashed underline
// and partial strings are displayed white on black indicating
}
// update the preedit string screen area.
- update(0, cur_y - preedit_lines_*height, viewport()->width(),
- (height + 1) * preedit_lines_);
+ update(0, cur_y - d->preedit_lines_*height, viewport()->width(),
+ (height + 1) * d->preedit_lines_);
// Don't forget to accept the event!
e->accept();
{
QRect cur_r(0, 0, 0, 0);
switch (query) {
- // this is the CJK-specific composition window position.
+ // this is the CJK-specific composition window position and
+ // the context menu position when the menu key is pressed.
case Qt::ImMicroFocus:
- cur_r = cursor_->rect();
- if (preedit_lines_ != 1)
+ cur_r = d->cursor_->rect();
+ if (d->preedit_lines_ != 1)
cur_r.moveLeft(10);
- cur_r.moveBottom(cur_r.bottom() + cur_r.height() * preedit_lines_);
+ cur_r.moveBottom(cur_r.bottom()
+ + cur_r.height() * (d->preedit_lines_ - 1));
// return lower right of cursor in LyX.
return cur_r;
default:
docstring maximize_title;
docstring minimize_title;
- Buffer & buf = buffer_view_->buffer();
- FileName const fileName = buf.fileName();
- if (!fileName.empty()) {
- maximize_title = fileName.displayName(30);
- minimize_title = from_utf8(fileName.onlyFileName());
+ Buffer const & buf = d->buffer_view_->buffer();
+ FileName const file_name = buf.fileName();
+ if (!file_name.empty()) {
+ maximize_title = file_name.displayName(130);
+ minimize_title = from_utf8(file_name.onlyFileName());
if (buf.lyxvc().inUse()) {
- if (buf.lyxvc().locker().empty())
- maximize_title += _(" (version control)");
- else
+ if (buf.lyxvc().locking())
maximize_title += _(" (version control, locking)");
+ else
+ maximize_title += _(" (version control)");
}
if (!buf.isClean()) {
maximize_title += _(" (changed)");
maximize_title += _(" (read only)");
}
- QString title = windowTitle();
- QString new_title = toqstr(maximize_title);
- if (title == new_title)
- return;
+ QString const new_title = toqstr(maximize_title);
+ if (new_title != windowTitle()) {
+ QWidget::setWindowTitle(new_title);
+ QWidget::setWindowIconText(toqstr(minimize_title));
+ titleChanged(this);
+ }
+}
+
- QWidget::setWindowTitle(new_title);
- QWidget::setWindowIconText(toqstr(minimize_title));
- titleChanged(this);
+bool GuiWorkArea::isFullScreen() const
+{
+ return d->lyx_view_ && d->lyx_view_->isFullScreen();
}
-void GuiWorkArea::setReadOnly(bool)
+void GuiWorkArea::scheduleRedraw()
{
- updateWindowTitle();
- if (this == lyx_view_->currentWorkArea())
- lyx_view_->updateDialogs();
+ d->schedule_redraw_ = true;
+}
+
+
+bool GuiWorkArea::inDialogMode() const
+{
+ return d->dialog_mode_;
+}
+
+
+void GuiWorkArea::setDialogMode(bool mode)
+{
+ d->dialog_mode_ = mode;
}
-bool GuiWorkArea::isFullScreen()
+GuiCompleter & GuiWorkArea::completer()
{
- return lyx_view_ && lyx_view_->isFullScreen();
+ return *d->completer_;
}
+GuiView const & GuiWorkArea::view() const
+{
+ return *d->lyx_view_;
+}
+
+
+GuiView & GuiWorkArea::view()
+{
+ return *d->lyx_view_;
+}
////////////////////////////////////////////////////////////////////
//
EmbeddedWorkArea::EmbeddedWorkArea(QWidget * w): GuiWorkArea(w)
{
buffer_ = theBufferList().newBuffer(
- support::FileName::tempName().absFilename() + "_embedded.internal");
+ support::FileName::tempName().absFileName() + "_embedded.internal");
buffer_->setUnnamed(true);
buffer_->setFullyLoaded(true);
setBuffer(*buffer_);
EmbeddedWorkArea::~EmbeddedWorkArea()
{
// No need to destroy buffer and bufferview here, because it is done
- // in theBuffeerList() destruction loop at application exit
+ // in theBufferList() destruction loop at application exit
}
}
+QSize EmbeddedWorkArea::sizeHint () const
+{
+ // FIXME(?):
+ // GuiWorkArea sets the size to the screen's viewport
+ // by returning a value this gets overridden
+ // EmbeddedWorkArea is now sized to fit in the layout
+ // of the parent, and has a minimum size set in GuiWorkArea
+ // which is what we return here
+ return QSize(100, 70);
+}
+
+
void EmbeddedWorkArea::disable()
{
stopBlinkingCursor();
if (view().currentWorkArea() != this)
return;
- LASSERT(view().currentMainWorkArea(), /* */);
+ // No problem if currentMainWorkArea() is 0 (setCurrentWorkArea()
+ // tolerates it and shows the background logo), what happens if
+ // an EmbeddedWorkArea is closed after closing all document WAs
view().setCurrentWorkArea(view().currentMainWorkArea());
}
#ifdef Q_WS_MACX
setStyle(&noTabFrameMacStyle);
#endif
+#if QT_VERSION < 0x040500
+ lyxrc.single_close_tab_button = true;
+#endif
QPalette pal = palette();
pal.setColor(QPalette::Active, QPalette::Button,
QObject::connect(this, SIGNAL(currentChanged(int)),
this, SLOT(on_currentTabChanged(int)));
-#if QT_VERSION < 0x040500
closeBufferButton = new QToolButton(this);
closeBufferButton->setPalette(pal);
// FIXME: rename the icon to closebuffer.png
QObject::connect(closeBufferButton, SIGNAL(clicked()),
this, SLOT(closeCurrentBuffer()));
setCornerWidget(closeBufferButton, Qt::TopRightCorner);
-#endif
// setup drag'n'drop
QTabBar* tb = new DragTabBar;
this, SLOT(showContextMenu(const QPoint &)));
#if QT_VERSION >= 0x040500
connect(tb, SIGNAL(tabCloseRequested(int)),
- tb, SLOT(on_tabCloseRequested(int)));
+ this, SLOT(closeTab(int)));
#endif
setUsesScrollButtons(true);
}
+void TabWorkArea::mouseDoubleClickEvent(QMouseEvent * event)
+{
+ if (event->button() != Qt::LeftButton)
+ return;
+
+ // return early if double click on existing tabs
+ for (int i = 0; i < count(); ++i)
+ if (tabBar()->tabRect(i).contains(event->pos()))
+ return;
+
+ dispatch(FuncRequest(LFUN_BUFFER_NEW));
+}
+
+
void TabWorkArea::setFullScreen(bool full_screen)
{
for (int i = 0; i != count(); ++i) {
- if (GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i)))
+ if (GuiWorkArea * wa = workArea(i))
wa->setFullScreen(full_screen);
}
if (lyxrc.full_screen_tabbar)
showBar(!full_screen && count() > 1);
+ else
+ showBar(count() > 1);
}
{
tabBar()->setEnabled(show);
tabBar()->setVisible(show);
-#if QT_VERSION < 0x040500
- closeBufferButton->setVisible(show);
+ closeBufferButton->setVisible(show && lyxrc.single_close_tab_button);
+#if QT_VERSION >= 0x040500
+ setTabsClosable(!lyxrc.single_close_tab_button);
#endif
}
}
+GuiWorkArea * TabWorkArea::workArea(int index)
+{
+ return dynamic_cast<GuiWorkArea *>(widget(index));
+}
+
+
GuiWorkArea * TabWorkArea::workArea(Buffer & buffer)
{
+ // FIXME: this method doesn't work if we have more than work area
+ // showing the same buffer.
for (int i = 0; i != count(); ++i) {
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
+ GuiWorkArea * wa = workArea(i);
LASSERT(wa, return 0);
if (&wa->bufferView().buffer() == &buffer)
return wa;
void TabWorkArea::closeAll()
{
while (count()) {
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(0));
+ GuiWorkArea * wa = workArea(0);
LASSERT(wa, /**/);
removeTab(0);
delete wa;
// returns e.g. on application destruction
if (i == -1)
return;
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
+ GuiWorkArea * wa = workArea(i);
LASSERT(wa, return);
- BufferView & bv = wa->bufferView();
- bv.cursor().fixIfBroken();
- bv.updateMetrics();
wa->setUpdatesEnabled(true);
- wa->redraw();
+ wa->redraw(true);
wa->setFocus();
///
currentWorkAreaChanged(wa);
LYXERR(Debug::GUI, "currentTabChanged " << i
- << "File" << bv.buffer().absFileName());
+ << " File: " << wa->bufferView().buffer().absFileName());
}
void TabWorkArea::closeCurrentBuffer()
{
- if (clicked_tab_ != -1)
- setCurrentIndex(clicked_tab_);
- else
- // Before dispatching the LFUN we should be sure this
- // is the current workarea.
- currentWorkAreaChanged(currentWorkArea());
-
- lyx::dispatch(FuncRequest(LFUN_BUFFER_CLOSE));
+ GuiWorkArea * wa;
+ if (clicked_tab_ == -1)
+ wa = currentWorkArea();
+ else {
+ wa = workArea(clicked_tab_);
+ LASSERT(wa, /**/);
+ }
+ wa->view().closeWorkArea(wa);
}
-void TabWorkArea::closeCurrentTab()
+void TabWorkArea::hideCurrentTab()
{
+ GuiWorkArea * wa;
if (clicked_tab_ == -1)
- removeWorkArea(currentWorkArea());
+ wa = currentWorkArea();
+ else {
+ wa = workArea(clicked_tab_);
+ LASSERT(wa, /**/);
+ }
+ wa->view().hideWorkArea(wa);
+}
+
+
+void TabWorkArea::closeTab(int index)
+{
+ on_currentTabChanged(index);
+ GuiWorkArea * wa;
+ if (index == -1)
+ wa = currentWorkArea();
else {
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_));
+ wa = workArea(index);
LASSERT(wa, /**/);
- removeWorkArea(wa);
}
+ wa->view().closeWorkArea(wa);
}
+
///
class DisplayPath {
public:
DisplayPath(int tab, FileName const & filename)
: tab_(tab)
{
- filename_ = toqstr(filename.onlyFileNameWithoutExt());
+ filename_ = (filename.extension() == "lyx") ?
+ toqstr(filename.onlyFileNameWithoutExt())
+ : toqstr(filename.onlyFileName());
postfix_ = toqstr(filename.absoluteFilePath()).
split("/", QString::SkipEmptyParts);
postfix_.pop_back();
// collect full names first: path into postfix, empty prefix and
// filename without extension
for (size_t i = 0; i < n; ++i) {
- GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(i));
+ GuiWorkArea * i_wa = workArea(i);
FileName const fn = i_wa->bufferView().buffer().fileName();
paths.push_back(DisplayPath(i, fn));
}
// set new tab titles
for (It it = paths.begin(); it != paths.end(); ++it) {
- GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(it->tab()));
- Buffer & buf = i_wa->bufferView().buffer();
+ int const tab_index = it->tab();
+ Buffer const & buf = workArea(tab_index)->bufferView().buffer();
+ QString tab_text = it->displayString();
if (!buf.fileName().empty() && !buf.isClean())
- setTabText(it->tab(), it->displayString() + "*");
- else
- setTabText(it->tab(), it->displayString());
+ tab_text += "*";
+ setTabText(tab_index, tab_text);
+ setTabToolTip(tab_index, it->abs());
}
}
// show tab popup
QMenu popup;
popup.addAction(QIcon(getPixmap("images/", "hidetab", "png")),
- qt_("Hide tab"), this, SLOT(closeCurrentTab()));
+ qt_("Hide tab"), this, SLOT(hideCurrentTab()));
popup.addAction(QIcon(getPixmap("images/", "closetab", "png")),
qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
popup.exec(tabBar()->mapToGlobal(pos));
{
setAcceptDrops(true);
#if QT_VERSION >= 0x040500
- setTabsClosable(true);
+ setTabsClosable(!lyxrc.single_close_tab_button);
#endif
}
-void DragTabBar::on_tabCloseRequested(int index)
-{
- setCurrentIndex(index);
- lyx::dispatch(FuncRequest(LFUN_BUFFER_CLOSE));
-}
-
-
#if QT_VERSION < 0x040300
int DragTabBar::tabAt(QPoint const & position) const
{