anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let the background widget also dispatch the keypresses to guiApp. Now, the Alt-? shortcuts (e.g., Alt-X for the minibuffer) also works when there is no document open. Besides the code is slightly simpler.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32898 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-08 20:08:48 +00:00
parent 403dccbf23
commit 907ac0c1a8
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/frontends/qt4/GuiView.cpp
View File

@ -154,6 +154,7 @@ public:
font.setPointSize(int(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble()));
pain.setFont(font);
pain.drawText(260, 15, text);
setFocusPolicy(Qt::StrongFocus);
}
void paintEvent(QPaintEvent *)
@ -164,6 +165,18 @@ public:
pain.drawPixmap(x, y, splash_);
}
void keyPressEvent(QKeyEvent * ev)
{
KeySymbol sym;
setKeySymbol(&sym, ev);
if (sym.isOK()) {
guiApp->processKeySym(sym, q_key_state(ev->modifiers()));
ev->accept();
} else {
ev->ignore();
}
}
private:
QPixmap splash_;
};
@ -248,6 +261,7 @@ struct GuiView::GuiViewPrivate
{
stack_widget_->setCurrentWidget(bg_widget_);
bg_widget_->setUpdatesEnabled(true);
bg_widget_->setFocus();
}
TabWorkArea * tabWorkArea(int i)
@ -576,6 +590,8 @@ void GuiView::setFocus()
QMainWindow::setFocus();
if (d.current_work_area_)
d.current_work_area_->setFocus();
else
d.bg_widget_->setFocus();
}
@ -913,25 +929,7 @@ bool GuiView::event(QEvent * e)
}
}
#endif
if (d.current_work_area_)
// Nothing special to do.
return QMainWindow::event(e);
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
// Let Qt handle menu access and the Tab keys to navigate keys to navigate
// between controls.
if (ke->modifiers() & Qt::AltModifier || ke->key() == Qt::Key_Tab
|| ke->key() == Qt::Key_Backtab)
return QMainWindow::event(e);
// Allow processing of shortcuts that are allowed even when no Buffer
// is viewed.
KeySymbol sym;
setKeySymbol(&sym, ke);
guiApp->processKeySym(sym, q_key_state(ke->modifiers()));
e->accept();
return true;
return QMainWindow::event(e);
}
default: