diff --git a/data/layout.xml b/data/layout.xml index f567798..c3eb299 100644 --- a/data/layout.xml +++ b/data/layout.xml @@ -1472,16 +1472,16 @@ Here's a list of what's available in this release. - + - + - + @@ -1605,7 +1605,7 @@ Here's a list of what's available in this release. - + @@ -1644,8 +1644,9 @@ Here's a list of what's available in this release. - + + diff --git a/src/main.cpp b/src/main.cpp index 96dac29..85819be 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -414,7 +414,7 @@ void init_vk_map() { for (int vk = 0; vk < 256; vk++) { - if (k == (int)convert_key(k)) + if (k == (int)convert_key(vk)) { if (vkey_map.find((kKey)k) == vkey_map.end()) { @@ -891,11 +891,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) static BYTE keys[256]; if (GetKeyboardState(keys)) { - bool alt = keys[VK_TAB] & 0x80; + bool alt = keys[VK_MENU] & 0x80; for (auto k : vkey_map) { // ignore alt + tab - if (alt && k.first == kKey::KeyAlt) + if (alt && k.first == kKey::KeyTab) continue; bool down = keys[k.second] & 0x80; if (App::I.keys[(int)k.first] && !down) diff --git a/src/node_panel_quick.cpp b/src/node_panel_quick.cpp index da35907..651391e 100644 --- a/src/node_panel_quick.cpp +++ b/src/node_panel_quick.cpp @@ -42,7 +42,7 @@ void NodePanelQuick::init_controls() m_slider_size = find("quick-size"); m_slider_size->on_value_changed = [this](Node* target, float value) { auto m = static_cast(Canvas::I->modes[(int)kCanvasMode::Draw][0]); - m->m_cur_pos = (m_slider_flow->m_pos + glm::vec2(100.F, 75.f)) * App::I.zoom; + m->m_cur_pos = (m_slider_flow->m_pos + glm::vec2(100.f, m_slider_flow->m_size.y / 2.f)) * App::I.zoom; m_button_brush_current_preview->draw_stroke(); if (on_size_change) on_size_change(target, value); @@ -50,7 +50,7 @@ void NodePanelQuick::init_controls() m_slider_flow = find("quick-flow"); m_slider_flow->on_value_changed = [this](Node* target, float value) { auto m = static_cast(Canvas::I->modes[(int)kCanvasMode::Draw][0]); - m->m_cur_pos = (m_slider_flow->m_pos + glm::vec2(100.F, 75.f)) * App::I.zoom; + m->m_cur_pos = (m_slider_flow->m_pos + glm::vec2(100.f, m_slider_flow->m_size.y / 2.f)) * App::I.zoom; m_button_brush_current_preview->draw_stroke(); if (on_flow_change) on_flow_change(target, value);