kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rapatriement dans la branche 0.3 des revisions 870 a 903.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@904 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2010-03-28 16:27:48 +00:00
parent 815a2ea3e8
commit c3563a8307
261 changed files with 23264 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/diagramview.cpp
View File

@@ -851,7 +851,12 @@ void DiagramView::editDefaultConductorProperties() {
bool DiagramView::event(QEvent *e) {
// fait en sorte que les raccourcis clavier arrivent prioritairement sur la
// vue plutot que de remonter vers les QMenu / QAction
if (e -> type() == QEvent::ShortcutOverride && scene -> focusItem()) {
if (
e -> type() == QEvent::ShortcutOverride &&
scene -> hasFocus() &&
scene -> focusItem() &&
scene -> focusItem() -> isSelected()
) {
e -> accept();
return(true);
}