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] disable settings modification during streaming

Browse Source
This commit is contained in:
dijunkun
2024-11-19 17:21:27 +08:00
parent 8132d62c02
commit c9d452a025
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/single_window/setting_window.cpp
View File

@@ -70,6 +70,10 @@ int Render::SettingWindow() {
ImGui::Separator(); ImGui::Separator();
if (streaming_) {
ImGui::BeginDisabled();
}
{ {
const char *video_quality_items[] = { const char *video_quality_items[] = {
localization::video_quality_high[localization_language_index_] localization::video_quality_high[localization_language_index_]
@@ -157,6 +161,10 @@ int Render::SettingWindow() {
ImGui::Checkbox("##enable_turn", &enable_turn_); ImGui::Checkbox("##enable_turn", &enable_turn_);
} }
if (streaming_) {
ImGui::EndDisabled();
}
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) { if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
ImGui::SetCursorPosX(SETTINGS_OK_BUTTON_PADDING_CN); ImGui::SetCursorPosX(SETTINGS_OK_BUTTON_PADDING_CN);
} else { } else {
@@ -226,7 +234,7 @@ int Render::SettingWindow() {
LoadSettingsFromCacheFile(); LoadSettingsFromCacheFile();
// Recreate peer instance // Recreate peer instance
{ if (!streaming_) {
LOG_INFO("Recreate peer instance"); LOG_INFO("Recreate peer instance");
DestroyPeer(&peer_); DestroyPeer(&peer_);
is_create_connection_ = false; is_create_connection_ = false;

20
src/single_window/title_bar.cpp
View File

@@ -20,11 +20,11 @@ int Render::TitleBar(bool main_window) {
if (ImGui::BeginMenuBar()) { if (ImGui::BeginMenuBar()) {
ImGui::SetCursorPosX( ImGui::SetCursorPosX(
(main_window ? main_window_width_ : stream_window_width_) - (main_window ? main_window_width_ : stream_window_width_) -
(streaming_ ? BUTTON_PADDING * 4 - 3 : BUTTON_PADDING * 3 - 3)); (BUTTON_PADDING * 3 - 3));
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0, 0, 0, 0.1f)); ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0, 0, 0, 0.1f));
ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImGui::PushStyleColor(ImGuiCol_HeaderActive,
ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
if (!streaming_) { if (main_window) {
float bar_pos_x = ImGui::GetCursorPosX() + 6; float bar_pos_x = ImGui::GetCursorPosX() + 6;
float bar_pos_y = ImGui::GetCursorPosY() + 15; float bar_pos_y = ImGui::GetCursorPosY() + 15;
std::string menu_button = " "; // ICON_FA_BARS; std::string menu_button = " "; // ICON_FA_BARS;
@@ -61,9 +61,9 @@ int Render::TitleBar(bool main_window) {
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0)); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
ImGui::SetCursorPosX( ImGui::SetCursorPosX(main_window
(main_window ? main_window_width_ : stream_window_width_) - ? (main_window_width_ - BUTTON_PADDING * 2)
(streaming_ ? BUTTON_PADDING * 3 : BUTTON_PADDING * 2)); : (stream_window_width_ - BUTTON_PADDING * 3));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::PushStyleColor(ImGuiCol_ButtonActive,
ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -80,10 +80,8 @@ int Render::TitleBar(bool main_window) {
IM_COL32(0, 0, 0, 255)); IM_COL32(0, 0, 0, 255));
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
if (streaming_) { if (!main_window) {
ImGui::SetCursorPosX( ImGui::SetCursorPosX(stream_window_width_ - BUTTON_PADDING * 2);
(main_window ? main_window_width_ : stream_window_width_) -
BUTTON_PADDING * 2);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::PushStyleColor(ImGuiCol_ButtonActive,
ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -97,7 +95,7 @@ int Render::TitleBar(bool main_window) {
"##restore"; // ICON_FA_WINDOW_RESTORE; "##restore"; // ICON_FA_WINDOW_RESTORE;
if (ImGui::Button(window_restore_button.c_str(), if (ImGui::Button(window_restore_button.c_str(),
ImVec2(BUTTON_PADDING, 30))) { ImVec2(BUTTON_PADDING, 30))) {
SDL_RestoreWindow(main_window ? main_window_ : stream_window_); SDL_RestoreWindow(stream_window_);
window_maximized_ = false; window_maximized_ = false;
} }
draw_list->AddRect(ImVec2(pos_x_top, pos_y_top), draw_list->AddRect(ImVec2(pos_x_top, pos_y_top),
@@ -116,7 +114,7 @@ int Render::TitleBar(bool main_window) {
"##maximize"; // ICON_FA_SQUARE_FULL; "##maximize"; // ICON_FA_SQUARE_FULL;
if (ImGui::Button(window_maximize_button.c_str(), if (ImGui::Button(window_maximize_button.c_str(),
ImVec2(BUTTON_PADDING, 30))) { ImVec2(BUTTON_PADDING, 30))) {
SDL_MaximizeWindow(main_window ? main_window_ : stream_window_); SDL_MaximizeWindow(stream_window_);
window_maximized_ = !window_maximized_; window_maximized_ = !window_maximized_;
} }
draw_list->AddRect(ImVec2(maximize_pos_x, maximize_pos_y), draw_list->AddRect(ImVec2(maximize_pos_x, maximize_pos_y),