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

[feat] set window resizable only in streaming state

Browse Source
This commit is contained in:
dijunkun
2024-07-25 10:10:37 +08:00
parent 8f5a53937a
commit 3685acc549
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/single_window/render.cpp
View File

@@ -218,11 +218,10 @@ int Render::Run() {
#endif #endif
// Create main window with SDL_Renderer graphics context // Create main window with SDL_Renderer graphics context
SDL_WindowFlags window_flags = SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_ALLOW_HIGHDPI);
(SDL_WindowFlags)(SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_RESIZABLE); main_window_ = SDL_CreateWindow(
main_window_ = SDL_CreateWindow("Remote Desk", SDL_WINDOWPOS_UNDEFINED, "Remote Desk", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, main_window_width_, main_window_width_default_, main_window_height_default_, window_flags);
main_window_height_, window_flags);
main_renderer_ = SDL_CreateRenderer( main_renderer_ = SDL_CreateRenderer(
main_window_, -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED); main_window_, -1, SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED);
@@ -408,8 +407,17 @@ int Render::Run() {
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::PopStyleColor(); ImGui::PopStyleColor();
if (streaming_ && is_client_mode_) { if (streaming_ && is_client_mode_) {
if (!resizable_) {
resizable_ = !resizable_;
SDL_SetWindowResizable(main_window_, SDL_TRUE);
}
ControlWindow(); ControlWindow();
} else { } else {
if (resizable_) {
resizable_ = !resizable_;
SDL_SetWindowResizable(main_window_, SDL_FALSE);
}
MainWindow(); MainWindow();
} }
@@ -428,10 +436,8 @@ int Render::Run() {
connection_established_ = false; connection_established_ = false;
received_frame_ = false; received_frame_ = false;
is_client_mode_ = false; is_client_mode_ = false;
SDL_SetWindowSize(main_window_, main_window_width_last_, SDL_SetWindowSize(main_window_, main_window_width_default_,
main_window_height_last_); main_window_height_default_);
SDL_SetWindowPosition(main_window_, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED);
continue; continue;
} else { } else {
LOG_INFO("Quit program"); LOG_INFO("Quit program");
@@ -440,11 +446,6 @@ int Render::Run() {
} else if (event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) { } else if (event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
SDL_GetWindowSize(main_window_, &main_window_width_, SDL_GetWindowSize(main_window_, &main_window_width_,
&main_window_height_); &main_window_height_);
if (!streaming_) {
main_window_width_last_ = main_window_width_;
main_window_height_last_ = main_window_height_;
}
if (main_window_width_ * 9 < main_window_height_ * 16) { if (main_window_width_ * 9 < main_window_height_ * 16) {
stream_render_rect_.x = 0; stream_render_rect_.x = 0;
stream_render_rect_.y = stream_render_rect_.y =
@@ -463,7 +464,6 @@ int Render::Run() {
stream_render_rect_.w = main_window_width_; stream_render_rect_.w = main_window_width_;
stream_render_rect_.h = main_window_height_; stream_render_rect_.h = main_window_height_;
} }
} else if (event.type == SDL_WINDOWEVENT && } else if (event.type == SDL_WINDOWEVENT &&
event.window.event == SDL_WINDOWEVENT_CLOSE) { event.window.event == SDL_WINDOWEVENT_CLOSE) {
if (connection_established_) { if (connection_established_) {

3
src/single_window/render.h
View File

@@ -122,6 +122,8 @@ class Render {
private: private:
int screen_width_ = 1280; int screen_width_ = 1280;
int screen_height_ = 720; int screen_height_ = 720;
int main_window_width_default_ = 960;
int main_window_height_default_ = 540;
int main_window_width_ = 960; int main_window_width_ = 960;
int main_window_height_ = 540; int main_window_height_ = 540;
int main_window_width_last_ = 960; int main_window_width_last_ = 960;
@@ -160,6 +162,7 @@ class Render {
SDL_Rect stream_render_rect_; SDL_Rect stream_render_rect_;
uint32_t stream_pixformat_ = 0; uint32_t stream_pixformat_ = 0;
bool resizable_ = false;
bool inited_ = false; bool inited_ = false;
bool exit_ = false; bool exit_ = false;
bool exit_video_window_ = false; bool exit_video_window_ = false;