From 21596660163119b674498ceb07eea98381c03a0f Mon Sep 17 00:00:00 2001 From: LIghty Date: Sat, 24 Mar 2018 23:01:23 +0100 Subject: [PATCH 1/3] =?UTF-8?q?(=E2=95=AF=C2=B0=E2=96=A1=C2=B0=EF=BC=89?= =?UTF-8?q?=E2=95=AF=EF=B8=B5=20=E2=94=BB=E2=94=81=E2=94=BB(esp=5Femoji=5F?= =?UTF-8?q?scaling=20&=20esp=5Femoji=5Fmin=5Fsize)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/menu/ncc/Menu.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp index 4f7d6c97..024a7026 100644 --- a/src/menu/ncc/Menu.cpp +++ b/src/menu/ncc/Menu.cpp @@ -506,9 +506,7 @@ static const std::string list_tf2 = R"( "Emoji ESP Menu" "esp_emoji" "esp_okhand" - "esp_emoji_scaling" "esp_emoji_size" - "esp_emoji_min_size" ] ] "Chams" [ From 3919e97aa25b7ce604ff111cd3d18f434e7e94e2 Mon Sep 17 00:00:00 2001 From: LIghty Date: Sun, 25 Mar 2018 12:30:38 +0200 Subject: [PATCH 2/3] readd emoji scaling and min size --- src/menu/ncc/Menu.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp index 246fdb99..d840ce0c 100644 --- a/src/menu/ncc/Menu.cpp +++ b/src/menu/ncc/Menu.cpp @@ -506,7 +506,9 @@ static const std::string list_tf2 = R"( "Emoji ESP Menu" "esp_emoji" "esp_okhand" + "esp_emoji_scaling" "esp_emoji_size" + "esp_emoji_min_size" ] ] "Chams" [ From 5daa0692ac5e21178033b532943eb4ae856c9e80 Mon Sep 17 00:00:00 2001 From: LIghty Date: Sun, 25 Mar 2018 12:32:53 +0200 Subject: [PATCH 3/3] added mouse1 as a bindable key/minor fixes --- src/menu/ncc/ItemVariable.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/menu/ncc/ItemVariable.cpp b/src/menu/ncc/ItemVariable.cpp index 011164ac..f49df89b 100644 --- a/src/menu/ncc/ItemVariable.cpp +++ b/src/menu/ncc/ItemVariable.cpp @@ -77,7 +77,15 @@ bool ItemVariable::ConsumesKey(ButtonCode_t key) void ItemVariable::OnMousePress() { if (catvar.type == CV_KEY) - capturing = true; + { + if (capturing) + { + catvar = ButtonCode_t::MOUSE_LEFT; + capturing = false; + } + else + capturing = true; + } if (catvar.type == CV_SWITCH) catvar = !catvar; } @@ -107,8 +115,6 @@ void ItemVariable::OnKeyPress(ButtonCode_t key, bool repeat) switch (catvar.type) { - case CV_ENUM: - case CV_SWITCH: case CV_STRING: { if (key == ButtonCode_t::KEY_BACKSPACE) @@ -136,7 +142,6 @@ void ItemVariable::OnKeyPress(ButtonCode_t key, bool repeat) } } break; - case CV_INT: case CV_FLOAT: { if (catvar.restricted) @@ -144,6 +149,7 @@ void ItemVariable::OnKeyPress(ButtonCode_t key, bool repeat) else change = 1.0f; } + break; } if (change < 1.0f && catvar.type == CV_INT)