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

[fix] fix control bar display and button postion

Browse Source
This commit is contained in:
dijunkun
2024-07-24 17:10:05 +08:00
parent b9c5db41ab
commit 8f5a53937a
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/single_window/connection_status_window.cpp
View File

@@ -94,8 +94,7 @@ int Render::ConnectionStatusWindow() {
localization::ok[localization_language_index_].c_str())) { localization::ok[localization_language_index_].c_str())) {
show_connection_status_window_ = true; show_connection_status_window_ = true;
password_validating_ = true; password_validating_ = true;
JoinConnection(peer_reserved_ ? peer_reserved_ : peer_, remote_id_, rejoin_ = true;
remote_password_.c_str());
} }
ImGui::SameLine(); ImGui::SameLine();

3
src/single_window/control_bar.cpp
View File

@@ -46,8 +46,7 @@ int Render::ControlBar() {
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::Dummy(ImVec2(main_window_width_ * 0.91f, 0)); ImGui::SetCursorPosX(main_window_width_ - 35);
ImGui::SameLine();
} }
std::string control_bar = std::string control_bar =

4
src/single_window/remote_peer_window.cpp
View File

@@ -69,9 +69,9 @@ int Render::RemoteWindow() {
} }
} }
ret = JoinConnection(peer_reserved_ ? peer_reserved_ : peer_, ret = JoinConnection(peer_reserved_ ? peer_reserved_ : peer_,
remote_id_, client_password_); remote_id_, remote_password_.c_str());
if (0 == ret) { if (0 == ret) {
if (!peer_reserved_) { if (peer_reserved_) {
is_client_mode_ = true; is_client_mode_ = true;
} }
rejoin_ = false; rejoin_ = false;

8
src/single_window/render_callback_func.cpp
View File

@@ -182,15 +182,11 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, void *user_data) {
render->connection_established_ = true; render->connection_established_ = true;
render->streaming_ = true; render->streaming_ = true;
if (!render->is_client_mode_) { if (render->peer_reserved_ || !render->is_client_mode_) {
render->start_screen_capture_ = true; render->start_screen_capture_ = true;
render->start_mouse_control_ = true; render->start_mouse_control_ = true;
} else {
SDL_SetWindowSize(render->main_window_, render->stream_window_width_,
render->stream_window_height_);
SDL_SetWindowPosition(render->main_window_, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED);
} }
} else if (ConnectionStatus::Disconnected == status) { } else if (ConnectionStatus::Disconnected == status) {
render->connection_status_str_ = "Disconnected"; render->connection_status_str_ = "Disconnected";
render->password_validating_time_ = 0; render->password_validating_time_ = 0;