YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix control bar layout and position in stream window

Browse Source
This commit is contained in:
dijunkun
2025-04-30 18:18:55 +08:00
parent 893051f9b3
commit a9084ba98d
5 changed files with 90 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/single_window/control_window.cpp
View File

@@ -43,7 +43,7 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1, 1, 1, 1));
ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(0, 0));
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 10.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0);
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
@@ -51,86 +51,54 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
ImVec2(props->control_window_width_, props->control_window_height_),
ImGuiCond_Always);
if (0 == props->control_winodw_pos_.x && 0 == props->control_winodw_pos_.y) {
ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_ + 1), ImGuiCond_Once);
}
ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_ + 1), ImGuiCond_Once);
float pos_x = 0;
float pos_y = 0;
float y_boundary = fullscreen_button_pressed_ ? 0 : (title_bar_height_ + 1);
if (props->reset_control_bar_pos_) {
float new_control_window_pos_x, new_control_window_pos_y, new_cursor_pos_x,
new_cursor_pos_y;
float new_cursor_pos_x = 0;
float new_cursor_pos_y = 0;
// set control window pos
new_control_window_pos_x = props->control_winodw_pos_.x;
if (props->control_winodw_pos_.y < props->stream_render_rect_last_.y) {
new_control_window_pos_y =
props->stream_render_rect_.y -
(props->stream_render_rect_last_.y - props->control_winodw_pos_.y);
if (fullscreen_button_pressed_ && new_control_window_pos_y < 0) {
new_control_window_pos_y = 0;
} else if (!fullscreen_button_pressed_ &&
new_control_window_pos_y < (title_bar_height_ + 1)) {
new_control_window_pos_y = title_bar_height_ + 1;
}
} else if (props->control_winodw_pos_.y + props->control_window_height_ >
props->stream_render_rect_last_.y +
props->stream_render_rect_last_.h) {
new_control_window_pos_y =
props->stream_render_rect_.y + props->stream_render_rect_.h +
(props->control_winodw_pos_.y - props->stream_render_rect_last_.y -
props->stream_render_rect_last_.h);
if (new_control_window_pos_y >
props->sub_stream_window_height_ - props->control_window_height_) {
new_control_window_pos_y =
props->sub_stream_window_height_ - props->control_window_height_;
}
} else if (props->control_winodw_pos_.y + props->control_window_height_ ==
props->stream_render_rect_last_.y +
props->stream_render_rect_last_.h) {
new_control_window_pos_y = props->stream_render_rect_.y +
props->stream_render_rect_.h -
props->control_window_height_;
if (props->control_window_pos_.y + props->control_window_height_ >
stream_window_height_) {
pos_y = stream_window_height_ - props->control_window_height_;
} else if (props->control_window_pos_.y < y_boundary) {
pos_y = y_boundary;
} else {
new_control_window_pos_y =
(props->control_winodw_pos_.y - props->stream_render_rect_last_.y) /
(float)(props->stream_render_rect_last_.h) *
props->stream_render_rect_.h +
props->stream_render_rect_.y;
pos_y = props->control_window_pos_.y;
}
ImGui::SetNextWindowPos(
ImVec2(new_control_window_pos_x, new_control_window_pos_y),
ImGuiCond_Always);
if (props->is_control_bar_in_left_) {
pos_x = 0;
} else {
pos_x = stream_window_width_ - props->control_window_width_;
}
ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiCond_Always);
if (0 != props->mouse_diff_control_bar_pos_x_ &&
0 != props->mouse_diff_control_bar_pos_y_) {
// set cursor pos
new_cursor_pos_x =
new_control_window_pos_x + props->mouse_diff_control_bar_pos_x_;
new_cursor_pos_y =
new_control_window_pos_y + props->mouse_diff_control_bar_pos_y_;
new_cursor_pos_x = pos_x + props->mouse_diff_control_bar_pos_x_;
new_cursor_pos_y = pos_y + props->mouse_diff_control_bar_pos_y_;
SDL_WarpMouseInWindow(stream_window_, (int)new_cursor_pos_x,
(int)new_cursor_pos_y);
}
props->reset_control_bar_pos_ = false;
} else if (!props->reset_control_bar_pos_ &&
ImGui::IsMouseReleased(ImGuiPopupFlags_MouseButtonLeft) ||
ImGui::IsMouseReleased(ImGuiMouseButton_Left) ||
props->control_window_width_is_changing_) {
if (props->control_winodw_pos_.x <= props->sub_stream_window_width_ / 2) {
float pos_x = 0;
float pos_y =
(props->control_winodw_pos_.y >=
(fullscreen_button_pressed_ ? 0 : (title_bar_height_ + 1)) &&
props->control_winodw_pos_.y <=
props->sub_stream_window_height_ - props->control_window_height_)
? props->control_winodw_pos_.y
: (props->control_winodw_pos_.y < (fullscreen_button_pressed_
? 0
: (title_bar_height_ + 1))
? (fullscreen_button_pressed_ ? 0
: (title_bar_height_ + 1))
: (props->sub_stream_window_height_ -
props->control_window_height_));
if (props->control_window_pos_.x <= stream_window_width_ / 2) {
if (props->control_window_pos_.y + props->control_window_height_ >
stream_window_height_) {
pos_y = stream_window_height_ - props->control_window_height_;
} else {
pos_y = props->control_window_pos_.y;
}
if (props->control_bar_expand_) {
if (props->control_window_width_ >= props->control_window_max_width_) {
@@ -147,51 +115,50 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
props->control_window_width_is_changing_ = true;
}
}
ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiCond_Always);
props->is_control_bar_in_left_ = true;
} else if (props->control_winodw_pos_.x >
props->sub_stream_window_width_ / 2) {
float pos_x = 0;
float pos_y =
(props->control_winodw_pos_.y >=
(fullscreen_button_pressed_ ? 0 : (title_bar_height_ + 1)) &&
props->control_winodw_pos_.y <=
props->sub_stream_window_height_ - props->control_window_height_)
? props->control_winodw_pos_.y
: (props->control_winodw_pos_.y < (fullscreen_button_pressed_
} else if (props->control_window_pos_.x > stream_window_width_ / 2) {
pos_x = 0;
pos_y =
(props->control_window_pos_.y >= y_boundary &&
props->control_window_pos_.y <=
stream_window_height_ - props->control_window_height_)
? props->control_window_pos_.y
: (props->control_window_pos_.y < (fullscreen_button_pressed_
? 0
: (title_bar_height_ + 1))
? (fullscreen_button_pressed_ ? 0
: (title_bar_height_ + 1))
: (props->sub_stream_window_height_ -
props->control_window_height_));
: (stream_window_height_ - props->control_window_height_));
if (props->control_bar_expand_) {
if (props->control_window_width_ >= props->control_window_max_width_) {
props->control_window_width_ = props->control_window_max_width_;
props->control_window_width_is_changing_ = false;
pos_x = props->sub_stream_window_width_ -
props->control_window_max_width_;
pos_x = stream_window_width_ - props->control_window_max_width_;
} else {
props->control_window_width_is_changing_ = true;
pos_x =
props->sub_stream_window_width_ - props->control_window_width_;
pos_x = stream_window_width_ - props->control_window_width_;
}
} else {
if (props->control_window_width_ <= props->control_window_min_width_) {
props->control_window_width_ = props->control_window_min_width_;
props->control_window_width_is_changing_ = false;
pos_x = props->sub_stream_window_width_ -
props->control_window_min_width_;
pos_x = stream_window_width_ - props->control_window_min_width_;
} else {
props->control_window_width_is_changing_ = true;
pos_x =
props->sub_stream_window_width_ - props->control_window_width_;
pos_x = stream_window_width_ - props->control_window_width_;
}
}
ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiCond_Always);
props->is_control_bar_in_left_ = false;
}
if (props->control_window_pos_.y + props->control_window_height_ >
stream_window_height_) {
pos_y = stream_window_height_ - props->control_window_height_;
} else if (props->control_window_pos_.y < y_boundary) {
pos_y = y_boundary;
}
ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiCond_Always);
}
if (props->control_bar_expand_ && props->control_window_height_is_changing_) {
@@ -217,20 +184,20 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoDocking);
ImGui::PopStyleVar();
props->control_winodw_pos_ = ImGui::GetWindowPos();
props->control_window_pos_ = ImGui::GetWindowPos();
SDL_GetMouseState(&props->mouse_pos_x_, &props->mouse_pos_y_);
props->mouse_diff_control_bar_pos_x_ =
props->mouse_pos_x_ - props->control_winodw_pos_.x;
props->mouse_pos_x_ - props->control_window_pos_.x;
props->mouse_diff_control_bar_pos_y_ =
props->mouse_pos_y_ - props->control_winodw_pos_.y;
props->mouse_pos_y_ - props->control_window_pos_.y;
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
static bool a, b, c, d, e;
ImGui::SetNextWindowPos(
ImVec2(props->is_control_bar_in_left_
? props->control_winodw_pos_.x - props->control_window_width_
: props->control_winodw_pos_.x,
props->control_winodw_pos_.y),
? props->control_window_pos_.x - props->control_window_width_
: props->control_window_pos_.x,
props->control_window_pos_.y),
ImGuiCond_Always);
ImGui::SetWindowFontScale(0.5f);