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

Use FontAwesome6 to render icons

Browse Source
This commit is contained in:
dijunkun
2024-06-18 17:28:02 +08:00
parent 71178ffa33
commit 172b8836fd
5 changed files with 1454 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
fonts/fa-solid-900.ttf Normal file
View File

Binary file not shown.

1408
src/multiple_windows/IconsFontAwesome6.h Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/multiple_windows/layout_style.h
View File

@@ -9,7 +9,7 @@
#ifdef _WIN32
#define MENU_WINDOW_WIDTH_CN 300
#define MENU_WINDOW_HEIGHT_CN 245
#define MENU_WINDOW_HEIGHT_CN 280
#define MENU_WINDOW_WIDTH_EN 190
#define MENU_WINDOW_HEIGHT_EN 245
#define IPUT_WINDOW_WIDTH 190

48
src/multiple_windows/main_window.cpp
View File

@@ -4,6 +4,7 @@
#include <iostream>
#include <string>
#include "IconsFontAwesome6.h"
#include "device_controller_factory.h"
#include "layout_style.h"
#include "localization.h"
@@ -243,6 +244,15 @@ int MainWindow::Run() {
#endif
}
ImFontConfig config;
config.MergeMode = true;
config.GlyphMinAdvanceX =
13.0f; // Use if you want to make the icon monospaced
static const ImWchar icon_ranges[] = {ICON_MIN_FA, ICON_MAX_FA, 0};
io.Fonts->AddFontFromFileTTF("fonts/fa-solid-900.ttf", 30.0f, &config,
icon_ranges);
io.Fonts->Build();
// Setup Dear ImGui style
// ImGui::StyleColorsDark();
ImGui::StyleColorsLight();
@@ -372,7 +382,6 @@ int MainWindow::Run() {
ImGui::Spacing();
ImGui::SetWindowFontScale(1.0f);
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0, 0, 0, 0.3));
ImGui::InputTextWithHint(
"##server_pwd",
localization::max_password_len[localization_language_index_]
@@ -381,13 +390,36 @@ int MainWindow::Run() {
show_password_ ? ImGuiInputTextFlags_CharsNoBlank
: ImGuiInputTextFlags_CharsNoBlank |
ImGuiInputTextFlags_Password);
ImGui::PopStyleColor();
ImGui::SameLine();
ImGui::SetWindowFontScale(0.5f);
if (ImGui::Button(u8"<EFBFBD>鿴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", ImVec2(80, 35))) {
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0));
if (ImGui::Button(show_password_ ? ICON_FA_EYE : ICON_FA_EYE_SLASH,
ImVec2(50, 35))) {
show_password_ = !show_password_;
}
ImGui::PopStyleColor(3);
ImGui::PopStyleColor();
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0));
if (!regenerate_password_) {
if (ImGui::Button(ICON_FA_ARROWS_ROTATE, ImVec2(38, 38))) {
regenerate_password_ = true;
}
} else {
regenerate_password_frame_count_++;
if (ImGui::Button(ICON_FA_SPINNER)) {
}
if (regenerate_password_frame_count_ == 30) {
regenerate_password_frame_count_ = 0;
regenerate_password_ = false;
}
}
ImGui::PopStyleColor(3);
if (strcmp(input_password_tmp_, input_password_)) {
SaveSettingsIntoCacheFile();
@@ -445,10 +477,13 @@ int MainWindow::Run() {
ImGui::Spacing();
if (ImGui::Button(settings_button_label_.c_str())) {
ImGui::SetWindowFontScale(0.5f);
std::string gear = ICON_FA_GEAR + settings_button_label_;
if (ImGui::Button(gear.c_str(), ImVec2(55, 25))) {
settings_button_pressed_ = !settings_button_pressed_;
settings_window_pos_reset_ = true;
}
ImGui::SetWindowFontScale(1.0f);
if (settings_button_pressed_) {
if (settings_window_pos_reset_) {
@@ -480,13 +515,14 @@ int MainWindow::Run() {
settings_window_pos_reset_ = false;
}
ImGui::SetWindowFontScale(0.5f);
// Settings
ImGui::Begin(
localization::settings[localization_language_index_].c_str(),
nullptr,
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
ImGuiWindowFlags_NoSavedSettings);
ImGui::SetWindowFontScale(0.5f);
{
const char *language_items[] = {
localization::language_zh[localization_language_index_].c_str(),

4
src/multiple_windows/main_window.h
View File

@@ -128,7 +128,9 @@ class MainWindow {
bool audio_buffer_fresh_ = false;
bool rejoin_ = false;
bool control_mouse_ = false;
bool show_password_ = false;
bool show_password_ = true;
bool regenerate_password_ = false;
int regenerate_password_frame_count_ = 0;
int fps_ = 0;
uint32_t start_time_;