Emulation/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2025-04-02 10:52:32 -04:00
Code Issues Projects Releases Packages Wiki Activity
123658 commits 42 branches 133 tags 2.1 GiB
Commit graph

235 commits

Author SHA1 Message Date
Tarek Soliman
16d529cdc3 KEYMAPPER: Use single column in remap dialog 
This is to allow for long labels like in the eob keymap
 2011-12-30 15:52:40 -06:00
Tarek Soliman
0e0eddbab3 KEYMAPPER: Fix clear button behavior in remap dialog 
This is a regression from 1b11139dc5
 2011-12-30 13:13:41 -06:00
Tarek Soliman
366a942a3a KEYMAPPER: Simplify calling getKeymap 2011-12-30 13:03:39 -06:00
Filippos Karapetis
a473934abd COMMON: Perform some keymapper-related changes to the KeyState struct 
The == operator in KeyState should not be checking for sticky modifier
keys. This allows the keymapper's defined actions to function correctly
in desktop platforms, when sticky modifier keys such as caps lock and
num lock are turned on. Also, added some sanity checks to hasFlags()
and enums for sticky and non-sticky keys
 2011-12-30 13:59:55 +02:00
Filippos Karapetis
d55ce36268 KEYMAPPER: Use hasFlags() in findHardwareKey() 2011-12-30 01:15:06 +02:00
Filippos Karapetis
1d3ff35373 KEYMAPPER: Disable the (accidentally reenabled automatic mapper again 2011-12-30 00:12:45 +02:00
Filippos Karapetis
410c9e0b30 KEYMAPPER: Fix broken implementation of findHardwareKey() 
This fixes the keymapper dialog (at least on desktop platforms), but the
keymapper itself is still not working (tested with LoL)
 2011-12-30 00:09:10 +02:00
Tarek Soliman
1b11139dc5 KEYMAPPER: Switch to using addClearButton() 2011-12-13 08:37:19 -06:00
Tarek Soliman
feb04d2164 KEYMAPPER: Add Common::KeyActionEntry for making simple keymap tables 2011-12-12 20:18:40 -06:00
Tarek Soliman
b708d6de79 Revert "KEYMAPPER: Make global keymap that is always active" 
This reverts commit ac85d134b3.
 2011-11-02 10:16:16 -05:00
Tarek Soliman
57bc9a21cc KEYMAPPER: Improved clear button 
It uses the fancy new kImageEraser now
 2011-10-28 22:53:30 -05:00
Tarek Soliman
07f1c2032a KEYMAPPER: Add tooltip text for clear buttons 2011-10-28 22:51:53 -05:00
Tarek Soliman
b8ef739d14 KEYMAPPER: Only skip the top GUI keymap when populating the active keymap 
This is because the top GUI keymap is for the keymapper dialog itself.
If all GUI keymaps are skipped then when inside a game with the GMM displayed
and the keymapper dialog invoked, the game keymap is displayed even though it
is not the active one.
 2011-10-27 10:46:23 -05:00
Tarek Soliman
a5082ffa5d KEYMAPPER: Skip GUI keymap when displaying active keymap in keymapper dialog 
This fixes a problem where opening the keymapper dialog would cause the current game
keymap to be displayed as the active keymap but then changing the keymap selection
back to it would cause the GUI keymap to be displayed as the active one. The GUI keymap
was indeed at the top of the stack but that's not the desired effect.

Also move the pushing and popping of the keymap to Dialog::Open/Close
Also constantify the GUI keymap name
 2011-10-27 10:46:22 -05:00
Tarek Soliman
ac85d134b3 KEYMAPPER: Make global keymap that is always active 
Keymapper now has a global keymap outside the active keymap stack.
That global keymap is always checked after the active stack has been checked.
 2011-10-27 10:46:22 -05:00
Tarek Soliman
913b36ab83 KEYMAPPER: Added clear buttons in remap dialog 
This allows clearing of the assigned key for an action.
 2011-10-27 10:46:22 -05:00
Tarek Soliman
e4f1277913 KEYMAPPER: Debugging and minor cleanup 2011-10-27 10:46:22 -05:00
Tarek Soliman
5e2ab7435d KEYMAPPER: Fix showing active keymap in remap dialog 2011-10-27 10:46:22 -05:00
Tarek Soliman
d5aa988f16 KEYMAPPER: Disable the broken auto mapping code 2011-10-27 09:53:26 -05:00
Pawel Kolodziejski
356c9c8c07 sync with scummvm 2011-05-18 23:33:39 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Pawel Kolodziejski
6be453780f synced with scummvm 2011-05-01 17:49:40 +02:00
Max Horn
7f74c477c6 BACKENDS: Really *really* fix keymapper code 2011-04-29 13:18:41 +02:00
Max Horn
5dd3c24238 BACKENDS: Really fix keymapper 2011-04-29 12:58:01 +02:00
Max Horn
cc9ffb58fa BACKENDS: Fix compilation of keymapper code 2011-04-29 12:54:10 +02:00
Ori Avtalion
cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Pawel Kolodziejski
252d484434 common/sys.h -> common/scummsys.h to minimalize diffs with scummvm 2011-04-17 01:00:10 +02:00
Pawel Kolodziejski
99ee683308 cleanup headers 2011-04-16 14:08:33 +02:00
Pawel Kolodziejski
1eb69577f8 fix include paths 2011-04-14 13:04:19 +02:00
Pawel Kolodziejski
0640dcf2c7 synced with scummvm to 2011-Apr-13 2011-04-14 12:41:26 +02:00
Pawel Kolodziejski
be1b3ab884 synced with scummvm svn rev 50000 2011-04-11 02:28:51 +02:00
Pawel Kolodziejski
e3a475ff7b synced with scummvm rev svn 49000 2011-04-10 21:59:04 +02:00
Max Horn
668adaa461 GUI: Rename gui/GuiManager.* to gui/gui-manager.* 
svn-id: r54265
 2010-11-16 10:19:01 +00:00
Max Horn
427dc1ae93 GUI: Move major widgets to new directory gui/widgets 
Also renamed the source/header files, now they are more closely
aligned to how we rename most other source files

svn-id: r54264
 2010-11-16 10:11:57 +00:00
Eugene Sandulenko
9e006b74d3 Keymapper: sync with recent GUI changes. 
svn-id: r49796
 2010-06-15 11:02:42 +00:00
Johannes Schickel
caf31ee5af Replace various strncpy usages by strlcpy. 
svn-id: r48955
 2010-05-05 17:54:12 +00:00
Max Horn
ef93d6921e Make keymapper compilable again 
svn-id: r48278
 2010-03-18 15:05:14 +00:00
Torbjorn Andersson
20a5e580b7 Silenced a bunch of mostly harmless cppcheck warnings. 2010-02-04 19:43:50 +00:00
Pawel Kolodziejski
edadbb35be synced code with scummvm trunk 2010-01-21 19:25:03 +00:00
Max Horn
490153232a Fix header guard 
svn-id: r47181
 2010-01-08 22:07:56 +00:00
Torbjörn Andersson
72eb9ec9ea Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null 
before freeing it, which isn't necessary.

svn-id: r46941
 2010-01-03 19:37:43 +00:00
Pawel Kolodziejski
7aa79c880d synced with scummvm 2009-10-05 08:33:46 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency 
svn-id: r44634
 2009-10-04 21:26:33 +00:00
Pawel Kolodziejski
99f070d475 cleanup headers 2009-10-04 10:33:50 +00:00
Pawel Kolodziejski
657272f7ba * added keymapper, not tested 2009-10-04 10:23:44 +00:00
Johannes Schickel
ef71667403 - Adapt DefaultEventManager to use Common::ArtificialEventSource 
- Adapt Keymapper to implement EventMapper interface

svn-id: r42727
 2009-07-25 01:01:05 +00:00
Eugene Sandulenko
b9017519fa Rename KeyRemapper dialog to KeyMapper 
svn-id: r41462
 2009-06-12 08:00:26 +00:00
Eugene Sandulenko
b0db1b5ed0 Implement FR#2507667: "GUI: Improve PopupWidget rendering / theme layouting". 
- Split out label from PopUp widget
- Aligned every widget on all layouts so GUI becomes to look nice again
- Moved textHAlign to layout properties

svn-id: r41266
 2009-06-06 17:52:44 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't 
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
 2009-05-31 10:02:16 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base. 
svn-id: r40867
 2009-05-24 15:17:42 +00:00