Commit da120a7 1 parent e52da8a commit da120a7 Copy full SHA for da120a7
File tree 3 files changed +33
-32
lines changed
3 files changed +33
-32
lines changed Original file line number Diff line number Diff line change 6
6
CMakeLists.txt.user
7
7
CMakeSettings.json
8
8
* ~
9
+ * .TMP
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ namespace cage
23
23
24
24
CAGE_FORCE_INLINE String finishName (String s)
25
25
{
26
- return replace (trim (s), " " , " + " );
26
+ return replace (trim (s), " " , " + " );
27
27
}
28
28
29
29
struct MatcherBase
@@ -124,11 +124,11 @@ namespace cage
124
124
{
125
125
String w;
126
126
if (direction > 0 )
127
- w = " WHUP " ;
127
+ w = " WhUp " ;
128
128
else if (direction < 0 )
129
- w = " WHDN " ;
129
+ w = " WhDn " ;
130
130
else
131
- w = " WHEEL " ;
131
+ w = " Wheel " ;
132
132
return finishName (Stringizer () + getModifiersNames (requiredFlags) + " " + w);
133
133
}
134
134
};
Original file line number Diff line number Diff line change @@ -824,43 +824,43 @@ namespace cage
824
824
case GLFW_KEY_SPACE:
825
825
return " _____" ;
826
826
case GLFW_KEY_ESCAPE:
827
- return " ESC " ;
827
+ return " Esc " ;
828
828
case GLFW_KEY_ENTER:
829
- return " ENTER " ;
829
+ return " Enter " ;
830
830
case GLFW_KEY_TAB:
831
- return " TAB " ;
831
+ return " Tab " ;
832
832
case GLFW_KEY_BACKSPACE:
833
- return " BACK " ;
833
+ return " Back " ;
834
834
case GLFW_KEY_INSERT:
835
- return " INS " ;
835
+ return " Ins " ;
836
836
case GLFW_KEY_DELETE:
837
- return " DEL " ;
837
+ return " Del " ;
838
838
case GLFW_KEY_RIGHT:
839
- return " RIGHT " ;
839
+ return " Right " ;
840
840
case GLFW_KEY_LEFT:
841
- return " LEFT " ;
841
+ return " Left " ;
842
842
case GLFW_KEY_DOWN:
843
- return " DOWN " ;
843
+ return " Down " ;
844
844
case GLFW_KEY_UP:
845
- return " UP " ;
845
+ return " Up " ;
846
846
case GLFW_KEY_PAGE_UP:
847
- return " PGUP " ;
847
+ return " PgUp " ;
848
848
case GLFW_KEY_PAGE_DOWN:
849
- return " PGDN " ;
849
+ return " PgDn " ;
850
850
case GLFW_KEY_HOME:
851
- return " HOME " ;
851
+ return " Home " ;
852
852
case GLFW_KEY_END:
853
- return " END " ;
853
+ return " End " ;
854
854
case GLFW_KEY_CAPS_LOCK:
855
- return " CAPS " ;
855
+ return " Caps " ;
856
856
case GLFW_KEY_SCROLL_LOCK:
857
- return " SCROLL " ;
857
+ return " Scroll " ;
858
858
case GLFW_KEY_NUM_LOCK:
859
- return " NUM " ;
859
+ return " Num " ;
860
860
case GLFW_KEY_PRINT_SCREEN:
861
- return " PRTSC " ;
861
+ return " Prtsc " ;
862
862
case GLFW_KEY_PAUSE:
863
- return " PAUSE " ;
863
+ return " Pause " ;
864
864
case GLFW_KEY_F1:
865
865
return " F1" ;
866
866
case GLFW_KEY_F2:
@@ -912,37 +912,37 @@ namespace cage
912
912
case GLFW_KEY_F25:
913
913
return " F25" ;
914
914
case GLFW_KEY_KP_ENTER:
915
- return " ENT " ;
915
+ return " Ent " ;
916
916
}
917
917
const auto s = glfwGetKeyName (key, 0 );
918
918
if (!s)
919
919
return " ???" ;
920
- return unicodeTransformString (String (s), UnicodeTransformConfig{ UnicodeTransformEnum::Uppercase });
920
+ return unicodeTransformString (String (s), UnicodeTransformConfig{ UnicodeTransformEnum::Titlecase });
921
921
}
922
922
923
923
detail::StringBase<27 > getButtonsNames (MouseButtonsFlags buttons)
924
924
{
925
925
String res;
926
926
if (any (buttons & MouseButtonsFlags::Left))
927
- res += " LMB " ;
927
+ res += " Lmb " ;
928
928
if (any (buttons & MouseButtonsFlags::Middle))
929
- res += " MMB " ;
929
+ res += " Mmb " ;
930
930
if (any (buttons & MouseButtonsFlags::Right))
931
- res += " RMB " ;
931
+ res += " Rmb " ;
932
932
return trim (res);
933
933
}
934
934
935
935
detail::StringBase<27 > getModifiersNames (ModifiersFlags mods)
936
936
{
937
937
String res;
938
938
if (any (mods & ModifiersFlags::Ctrl))
939
- res += " CTRL " ;
939
+ res += " Ctrl " ;
940
940
if (any (mods & ModifiersFlags::Shift))
941
- res += " SHIFT " ;
941
+ res += " Shift " ;
942
942
if (any (mods & ModifiersFlags::Alt))
943
- res += " ALT " ;
943
+ res += " Alt " ;
944
944
if (any (mods & ModifiersFlags::Super))
945
- res += " SUPER " ;
945
+ res += " Super " ;
946
946
return trim (res);
947
947
}
948
948
You can’t perform that action at this time.
0 commit comments