ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Yet more fixes for tab related focusing issues. I think that's the end 

of it.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@922 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-12-21 19:31:18 +00:00
parent e1e492f622
commit 34c7c24e47
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stella/src/gui/EventMappingWidget.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: EventMappingWidget.cxx,v 1.4 2005-12-21 01:50:16 stephena Exp $ // $Id: EventMappingWidget.cxx,v 1.5 2005-12-21 19:31:18 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -81,7 +81,7 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, int x, int y, int w, int
l.push_back(EventHandler::ourActionList[i].action); l.push_back(EventHandler::ourActionList[i].action);
myActionsList->setList(l); myActionsList->setList(l);
myActionSelected = myActionsList->getSelected(); myActionsList->setSelected(0);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -228,6 +228,14 @@ void EventMappingWidget::handleCommand(CommandSender* sender, int cmd,
} }
break; break;
case kListItemDoubleClickedCmd:
if(myActionsList->getSelected() >= 0)
{
myActionSelected = myActionsList->getSelected();
startRemapping();
}
break;
case kStartMapCmd: case kStartMapCmd:
startRemapping(); startRemapping();
break; break;

6
stella/src/gui/ListWidget.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: ListWidget.cxx,v 1.36 2005-10-09 20:49:57 stephena Exp $ // $Id: ListWidget.cxx,v 1.37 2005-12-21 19:31:18 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -73,9 +73,9 @@ void ListWidget::setSelected(int item)
{ {
assert(item >= -1 && item < (int)_list.size()); assert(item >= -1 && item < (int)_list.size());
if (isEnabled() && _selectedItem != item) if(isEnabled())
{ {
if (_editMode) if(_editMode)
abortEditMode(); abortEditMode();
_selectedItem = item; _selectedItem = item;