eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added ALT keyboard modifier handling for alternative GUI actions

Browse Source
This commit is contained in:
brunoherbelin
2020-08-29 13:09:11 +02:00
parent 5f86afac0c
commit c8ac4b2d95
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
UserInterfaceManager.cpp
View File

@@ -220,12 +220,13 @@ bool UserInterface::Init()
void UserInterface::handleKeyboard() void UserInterface::handleKeyboard()
{ {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
alt_modifier_active = io.KeyAlt;
auto ctrl = io.ConfigMacOSXBehaviors ? io.KeySuper : io.KeyCtrl; auto ctrl = io.ConfigMacOSXBehaviors ? io.KeySuper : io.KeyCtrl;
// Application "CTRL +"" Shortcuts // Application "CTRL +"" Shortcuts
if ( ctrl ) { if ( ctrl ) {
keyboard_modifier_active = true; ctrl_modifier_active = true;
if (ImGui::IsKeyPressed( GLFW_KEY_Q )) { if (ImGui::IsKeyPressed( GLFW_KEY_Q )) {
// Quit // Quit
@@ -233,7 +234,7 @@ void UserInterface::handleKeyboard()
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_O )) { else if (ImGui::IsKeyPressed( GLFW_KEY_O )) {
// SHIFT + CTRL + O : reopen current session // SHIFT + CTRL + O : reopen current session
if (keyboard_modifier_active && !Mixer::manager().session()->filename().empty()) if (ctrl_modifier_active && !Mixer::manager().session()->filename().empty())
Mixer::manager().load( Mixer::manager().session()->filename() ); Mixer::manager().load( Mixer::manager().session()->filename() );
// CTRL + O : Open session // CTRL + O : Open session
else else
@@ -287,7 +288,7 @@ void UserInterface::handleKeyboard()
} }
// No CTRL modifier // No CTRL modifier
else { else {
keyboard_modifier_active = false; ctrl_modifier_active = false;
// Application F-Keys // Application F-Keys
if (ImGui::IsKeyPressed( GLFW_KEY_F1 )) if (ImGui::IsKeyPressed( GLFW_KEY_F1 ))
@@ -424,7 +425,7 @@ void UserInterface::handleMouse()
Source *s = Mixer::manager().findSource(picked.first); Source *s = Mixer::manager().findSource(picked.first);
if (s != nullptr) { if (s != nullptr) {
// CTRL + clic = multiple selection // CTRL + clic = multiple selection
if (keyboard_modifier_active) { if (ctrl_modifier_active) {
if ( !Mixer::selection().contains(s) ) if ( !Mixer::selection().contains(s) )
Mixer::selection().add( s ); Mixer::selection().add( s );
else { else {

6
UserInterfaceManager.h
View File

@@ -104,7 +104,8 @@ class UserInterface
ToolBox toolbox; ToolBox toolbox;
MediaController mediacontrol; MediaController mediacontrol;
bool keyboard_modifier_active; bool ctrl_modifier_active;
bool alt_modifier_active;
bool show_vimix_config; bool show_vimix_config;
bool show_imgui_about; bool show_imgui_about;
bool show_gst_about; bool show_gst_about;
@@ -145,7 +146,8 @@ public:
void Terminate(); void Terminate();
// status querries // status querries
inline bool keyboardModifier() { return keyboard_modifier_active; } inline bool ctrlModifier() const { return ctrl_modifier_active; }
inline bool altModifier() const { return alt_modifier_active; }
void StartScreenshot(); void StartScreenshot();
void showPannel(int id = 0); void showPannel(int id = 0);

10
View.cpp
View File

@@ -752,7 +752,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
if (pick.first) { if (pick.first) {
// picking on the resizing handles in the corners // picking on the resizing handles in the corners
if ( pick.first == s->handle_[Handles::RESIZE] ) { if ( pick.first == s->handle_[Handles::RESIZE] ) {
if (UserInterface::manager().keyboardModifier()) if (UserInterface::manager().altModifier())
S_resize.y = S_resize.x; S_resize.y = S_resize.x;
sourceNode->scale_ = s->stored_status_->scale_ * S_resize; sourceNode->scale_ = s->stored_status_->scale_ * S_resize;
@@ -774,7 +774,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
// picking on the resizing handles left or right // picking on the resizing handles left or right
else if ( pick.first == s->handle_[Handles::RESIZE_H] ) { else if ( pick.first == s->handle_[Handles::RESIZE_H] ) {
sourceNode->scale_ = s->stored_status_->scale_ * glm::vec3(S_resize.x, 1.f, 1.f); sourceNode->scale_ = s->stored_status_->scale_ * glm::vec3(S_resize.x, 1.f, 1.f);
if (UserInterface::manager().keyboardModifier()) if (UserInterface::manager().altModifier())
sourceNode->scale_.x = float( int( sourceNode->scale_.x * 10.f ) ) / 10.f; sourceNode->scale_.x = float( int( sourceNode->scale_.x * 10.f ) ) / 10.f;
ret.type = Cursor_ResizeEW; ret.type = Cursor_ResizeEW;
@@ -784,7 +784,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
// picking on the resizing handles top or bottom // picking on the resizing handles top or bottom
else if ( pick.first == s->handle_[Handles::RESIZE_V] ) { else if ( pick.first == s->handle_[Handles::RESIZE_V] ) {
sourceNode->scale_ = s->stored_status_->scale_ * glm::vec3(1.f, S_resize.y, 1.f); sourceNode->scale_ = s->stored_status_->scale_ * glm::vec3(1.f, S_resize.y, 1.f);
if (UserInterface::manager().keyboardModifier()) if (UserInterface::manager().altModifier())
sourceNode->scale_.y = float( int( sourceNode->scale_.y * 10.f ) ) / 10.f; sourceNode->scale_.y = float( int( sourceNode->scale_.y * 10.f ) ) / 10.f;
ret.type = Cursor_ResizeNS; ret.type = Cursor_ResizeNS;
@@ -803,7 +803,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
sourceNode->rotation_ = s->stored_status_->rotation_ + glm::vec3(0.f, 0.f, angle); sourceNode->rotation_ = s->stored_status_->rotation_ + glm::vec3(0.f, 0.f, angle);
int degrees = int( glm::degrees(sourceNode->rotation_.z) ); int degrees = int( glm::degrees(sourceNode->rotation_.z) );
if (UserInterface::manager().keyboardModifier()) { if (UserInterface::manager().altModifier()) {
degrees = (degrees / 10) * 10; degrees = (degrees / 10) * 10;
sourceNode->rotation_.z = glm::radians( float(degrees) ); sourceNode->rotation_.z = glm::radians( float(degrees) );
} }
@@ -815,7 +815,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
else { else {
sourceNode->translation_ = s->stored_status_->translation_ + gl_Position_to - gl_Position_from; sourceNode->translation_ = s->stored_status_->translation_ + gl_Position_to - gl_Position_from;
if (UserInterface::manager().keyboardModifier()) { if (UserInterface::manager().altModifier()) {
sourceNode->translation_.x = float( int( sourceNode->translation_.x * 10.f ) ) / 10.f; sourceNode->translation_.x = float( int( sourceNode->translation_.x * 10.f ) ) / 10.f;
sourceNode->translation_.y = float( int( sourceNode->translation_.y * 10.f ) ) / 10.f; sourceNode->translation_.y = float( int( sourceNode->translation_.y * 10.f ) ) / 10.f;
} }