Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow pretty much any key for gestures, like Emerald

Browse Source
This commit is contained in:
Siana Gearz
2012-02-06 03:01:15 +01:00
parent f0d6200e8e
commit 8a49d4ef94
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llpreviewgesture.cpp
View File

@@ -567,20 +567,23 @@ void LLPreviewGesture::addModifiers()
combo->setCurrentByIndex(0); combo->setCurrentByIndex(0);
} }
static const std::string valid_key_to_string(KEY key)
{
std::string skey(1,(char)key);
std::string strkey = LLKeyboard::stringFromKey(key);
return ((skey == strkey && key >= ' ' && key <= '~') || (skey != strkey) ) ? strkey : "";
}
void LLPreviewGesture::addKeys() void LLPreviewGesture::addKeys()
{ {
LLComboBox* combo = mKeyCombo; LLComboBox* combo = mKeyCombo;
combo->add( NONE_LABEL ); combo->add( NONE_LABEL );
for (KEY key = ' '; key < KEY_NONE; key++)
// <edit> {
//define for the lulz std::string keystr = valid_key_to_string(key);
#define addKey(k) combo->add( LLKeyboard::stringFromKey(k), ADD_BOTTOM ); if(keystr != "")combo->add( keystr, ADD_BOTTOM );
for (KEY key = KEY_F2; key <= KEY_F12; key++) }
addKey(key)
for (KEY key = ' '; key <= '~'; key++)
addKey(key)
// </edit>
combo->setCurrentByIndex(0); combo->setCurrentByIndex(0);
} }