diff --git a/src/main_window/element_style.h b/src/main_window/layout_style.h similarity index 61% rename from src/main_window/element_style.h rename to src/main_window/layout_style.h index b1e327b..8a773d7 100644 --- a/src/main_window/element_style.h +++ b/src/main_window/layout_style.h @@ -1,28 +1,35 @@ +/* + * @Author: DI JUNKUN + * @Date: 2024-06-14 + * Copyright (c) 2024 by DI JUNKUN, All Rights Reserved. + */ + +#ifndef _LAYOUT_STYLE_H_ +#define _LAYOUT_STYLE_H_ + #ifdef _WIN32 #define MENU_WINDOW_WIDTH_CN 160 #define MENU_WINDOW_HEIGHT_CN 245 #define MENU_WINDOW_WIDTH_EN 190 #define MENU_WINDOW_HEIGHT_EN 245 -#define IPUT_WINDOW_WIDTH 90 -#define INPUT_WINDOW_PADDING_CN 60 -#define INPUT_WINDOW_PADDING_EN 80 -#define SETTINGS_WINDOW_WIDTH_CN 188 +#define IPUT_WINDOW_WIDTH 86 +#define INPUT_WINDOW_PADDING_CN 66 +#define INPUT_WINDOW_PADDING_EN 96 +#define SETTINGS_WINDOW_WIDTH_CN 181 #define SETTINGS_WINDOW_WIDTH_EN 228 #define SETTINGS_WINDOW_HEIGHT_CN 190 #define SETTINGS_WINDOW_HEIGHT_EN 190 #define LANGUAGE_SELECT_WINDOW_PADDING_CN 100 -#define LANGUAGE_SELECT_WINDOW_PADDING_EN 140 +#define LANGUAGE_SELECT_WINDOW_PADDING_EN 147 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 100 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 -#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN 100 -#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN 140 -#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_CN 161 -#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_EN 201 -#define SETTINGS_SELECT_WINDOW_WIDTH 60 -#define SETTINGS_OK_BUTTON_PADDING_CN 60 -#define SETTINGS_OK_BUTTON_PADDING_EN 80 +#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 147 +#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 100 +#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 147 +#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 154 +#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 201 +#define SETTINGS_SELECT_WINDOW_WIDTH 73 +#define SETTINGS_OK_BUTTON_PADDING_CN 55 +#define SETTINGS_OK_BUTTON_PADDING_EN 78 #elif __linux__ #define MENU_WINDOW_WIDTH_CN 160 #define MENU_WINDOW_HEIGHT_CN 245 @@ -39,12 +46,10 @@ #define LANGUAGE_SELECT_WINDOW_PADDING_EN 140 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 100 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 -#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN 100 -#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN 140 -#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_CN 161 -#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_EN 201 +#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 100 +#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 140 +#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 161 +#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 201 #define SETTINGS_SELECT_WINDOW_WIDTH 60 #define SETTINGS_OK_BUTTON_PADDING_CN 60 #define SETTINGS_OK_BUTTON_PADDING_EN 80 @@ -64,13 +69,13 @@ #define LANGUAGE_SELECT_WINDOW_PADDING_EN 150 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 150 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 -#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 150 -#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN 90 -#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN 150 +#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 90 +#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 150 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_CN 133 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_EN 193 #define SETTINGS_SELECT_WINDOW_WIDTH 62 #define SETTINGS_OK_BUTTON_PADDING_CN 50 #define SETTINGS_OK_BUTTON_PADDING_EN 80 +#endif + #endif \ No newline at end of file diff --git a/src/main_window/main_window.cpp b/src/main_window/main_window.cpp index afb632d..4f008ad 100644 --- a/src/main_window/main_window.cpp +++ b/src/main_window/main_window.cpp @@ -5,7 +5,7 @@ #include #include "device_controller_factory.h" -#include "element_style.h" +#include "layout_style.h" #include "localization.h" #include "log.h" #include "platform.h" @@ -649,9 +649,9 @@ int MainWindow::Run() { .c_str()); if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) { - ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN); + ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN); } else { - ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN); + ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN); } ImGui::SetCursorPosY(90); ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH); @@ -672,10 +672,10 @@ int MainWindow::Run() { if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) { ImGui::SetCursorPosX( - ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_CN); + ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN); } else { ImGui::SetCursorPosX( - ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_EN); + ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN); } ImGui::SetCursorPosY(120); ImGui::Checkbox("##enable_hardware_video_codec", diff --git a/src/main_window/main_window.h b/src/main_window/main_window.h index a14b50c..7b69e54 100644 --- a/src/main_window/main_window.h +++ b/src/main_window/main_window.h @@ -70,10 +70,6 @@ class MainWindow { int video_quality; int video_encode_format; bool enable_hardware_video_codec; - float settings_language_pos; - float settings_video_quality_pos; - float settings_video_encode_format_pos; - float settings_enable_hardware_video_codec_pos; } CDCache; private: