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

Update Windows platform layout style

Browse Source
This commit is contained in:
dijunkun
2024-06-14 16:02:55 +08:00
parent 399785409c
commit 34d6bac345
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main_window/element_style.h → src/main_window/layout_style.h
View File

@@ -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 #ifdef _WIN32
#define MENU_WINDOW_WIDTH_CN 160 #define MENU_WINDOW_WIDTH_CN 160
#define MENU_WINDOW_HEIGHT_CN 245 #define MENU_WINDOW_HEIGHT_CN 245
#define MENU_WINDOW_WIDTH_EN 190 #define MENU_WINDOW_WIDTH_EN 190
#define MENU_WINDOW_HEIGHT_EN 245 #define MENU_WINDOW_HEIGHT_EN 245
#define IPUT_WINDOW_WIDTH 90 #define IPUT_WINDOW_WIDTH 86
#define INPUT_WINDOW_PADDING_CN 60 #define INPUT_WINDOW_PADDING_CN 66
#define INPUT_WINDOW_PADDING_EN 80 #define INPUT_WINDOW_PADDING_EN 96
#define SETTINGS_WINDOW_WIDTH_CN 188 #define SETTINGS_WINDOW_WIDTH_CN 181
#define SETTINGS_WINDOW_WIDTH_EN 228 #define SETTINGS_WINDOW_WIDTH_EN 228
#define SETTINGS_WINDOW_HEIGHT_CN 190 #define SETTINGS_WINDOW_HEIGHT_CN 190
#define SETTINGS_WINDOW_HEIGHT_EN 190 #define SETTINGS_WINDOW_HEIGHT_EN 190
#define LANGUAGE_SELECT_WINDOW_PADDING_CN 100 #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_CN 100
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 147
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 #define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 100
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 #define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 147
#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN 100 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 154
#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN 140 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 201
#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_CN 161 #define SETTINGS_SELECT_WINDOW_WIDTH 73
#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_EN 201 #define SETTINGS_OK_BUTTON_PADDING_CN 55
#define SETTINGS_SELECT_WINDOW_WIDTH 60 #define SETTINGS_OK_BUTTON_PADDING_EN 78
#define SETTINGS_OK_BUTTON_PADDING_CN 60
#define SETTINGS_OK_BUTTON_PADDING_EN 80
#elif __linux__ #elif __linux__
#define MENU_WINDOW_WIDTH_CN 160 #define MENU_WINDOW_WIDTH_CN 160
#define MENU_WINDOW_HEIGHT_CN 245 #define MENU_WINDOW_HEIGHT_CN 245
@@ -39,12 +46,10 @@
#define LANGUAGE_SELECT_WINDOW_PADDING_EN 140 #define LANGUAGE_SELECT_WINDOW_PADDING_EN 140
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 100 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 100
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 #define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 100
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 140 #define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 140
#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN 100 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 161
#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN 140 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 201
#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_SELECT_WINDOW_WIDTH 60
#define SETTINGS_OK_BUTTON_PADDING_CN 60 #define SETTINGS_OK_BUTTON_PADDING_CN 60
#define SETTINGS_OK_BUTTON_PADDING_EN 80 #define SETTINGS_OK_BUTTON_PADDING_EN 80
@@ -64,13 +69,13 @@
#define LANGUAGE_SELECT_WINDOW_PADDING_EN 150 #define LANGUAGE_SELECT_WINDOW_PADDING_EN 150
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 150 #define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 150
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 90 #define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 90
#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 150 #define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 150
#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN 90
#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN 150
#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_CN 133 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_CN 133
#define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_EN 193 #define ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_EN 193
#define SETTINGS_SELECT_WINDOW_WIDTH 62 #define SETTINGS_SELECT_WINDOW_WIDTH 62
#define SETTINGS_OK_BUTTON_PADDING_CN 50 #define SETTINGS_OK_BUTTON_PADDING_CN 50
#define SETTINGS_OK_BUTTON_PADDING_EN 80 #define SETTINGS_OK_BUTTON_PADDING_EN 80
#endif
#endif #endif

10
src/main_window/main_window.cpp
View File

@@ -5,7 +5,7 @@
#include <string> #include <string>
#include "device_controller_factory.h" #include "device_controller_factory.h"
#include "element_style.h" #include "layout_style.h"
#include "localization.h" #include "localization.h"
#include "log.h" #include "log.h"
#include "platform.h" #include "platform.h"
@@ -649,9 +649,9 @@ int MainWindow::Run() {
.c_str()); .c_str());
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) { if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_CN); ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN);
} else { } else {
ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_EN); ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN);
} }
ImGui::SetCursorPosY(90); ImGui::SetCursorPosY(90);
ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH); ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);
@@ -672,10 +672,10 @@ int MainWindow::Run() {
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) { if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
ImGui::SetCursorPosX( ImGui::SetCursorPosX(
ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_CN); ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN);
} else { } else {
ImGui::SetCursorPosX( ImGui::SetCursorPosX(
ENABLE_HARDWARE_VIDEO_CODEC_CHECK_WINDOW_PADDING_EN); ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN);
} }
ImGui::SetCursorPosY(120); ImGui::SetCursorPosY(120);
ImGui::Checkbox("##enable_hardware_video_codec", ImGui::Checkbox("##enable_hardware_video_codec",

4
src/main_window/main_window.h
View File

@@ -70,10 +70,6 @@ class MainWindow {
int video_quality; int video_quality;
int video_encode_format; int video_encode_format;
bool enable_hardware_video_codec; 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; } CDCache;
private: private: