fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI] Slightly improved performance of on screen notifications and achievements

Browse Source
This commit is contained in:
Gliniak
2026-03-15 00:04:55 +01:00
parent 3f74dfef10
commit dfd450fcbb
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/xenia/ui/imgui_guest_notification.cc
View File

@@ -113,9 +113,9 @@ void AchievementNotificationWindow::OnDraw(ImGuiIO& io) {
return; return;
} }
const std::string longest_notification_text_line = const std::string_view longest_notification_text_line =
GetTitle().size() > GetDescription().size() ? GetTitle().c_str() GetTitle().size() > GetDescription().size() ? GetTitle()
: GetDescription().c_str(); : GetDescription();
const ImVec2 screen_size = io.DisplaySize; const ImVec2 screen_size = io.DisplaySize;
const float window_scale = const float window_scale =
@@ -124,7 +124,7 @@ void AchievementNotificationWindow::OnDraw(ImGuiIO& io) {
const float font_scale = default_font_size / io.Fonts->Fonts[0]->FontSize; const float font_scale = default_font_size / io.Fonts->Fonts[0]->FontSize;
const ImVec2 text_size = io.Fonts->Fonts[0]->CalcTextSizeA( const ImVec2 text_size = io.Fonts->Fonts[0]->CalcTextSizeA(
default_font_size * default_notification_text_scale * window_scale, default_font_size * default_notification_text_scale * window_scale,
FLT_MAX, -1.0f, longest_notification_text_line.c_str()); FLT_MAX, -1.0f, longest_notification_text_line.data());
const ImVec2 final_notification_size = const ImVec2 final_notification_size =
CalculateNotificationSize(text_size, window_scale); CalculateNotificationSize(text_size, window_scale);
@@ -169,7 +169,7 @@ void AchievementNotificationWindow::OnDraw(ImGuiIO& io) {
ImGui::SameLine(); ImGui::SameLine();
if (notification_draw_progress_ > 0.5f) { if (notification_draw_progress_ > 0.5f) {
ImGui::TextColored(white_color, "%s", GetNotificationText().c_str()); ImGui::TextColored(white_color, "%s", GetNotificationText().data());
} }
} }
// Restore previous style // Restore previous style
@@ -187,9 +187,9 @@ void XNotifyWindow::OnDraw(ImGuiIO& io) {
return; return;
} }
const std::string longest_notification_text_line = const std::string_view longest_notification_text_line =
GetTitle().size() > GetDescription().size() ? GetTitle().c_str() GetTitle().size() > GetDescription().size() ? GetTitle()
: GetDescription().c_str(); : GetDescription();
const ImVec2 screen_size = io.DisplaySize; const ImVec2 screen_size = io.DisplaySize;
const float window_scale = const float window_scale =
@@ -198,7 +198,7 @@ void XNotifyWindow::OnDraw(ImGuiIO& io) {
const float font_scale = default_font_size / io.Fonts->Fonts[0]->FontSize; const float font_scale = default_font_size / io.Fonts->Fonts[0]->FontSize;
const ImVec2 text_size = io.Fonts->Fonts[0]->CalcTextSizeA( const ImVec2 text_size = io.Fonts->Fonts[0]->CalcTextSizeA(
default_font_size * default_notification_text_scale * window_scale, default_font_size * default_notification_text_scale * window_scale,
FLT_MAX, -1.0f, longest_notification_text_line.c_str()); FLT_MAX, -1.0f, longest_notification_text_line.data());
const ImVec2 final_notification_size = const ImVec2 final_notification_size =
CalculateNotificationSize(text_size, window_scale); CalculateNotificationSize(text_size, window_scale);
@@ -247,7 +247,7 @@ void XNotifyWindow::OnDraw(ImGuiIO& io) {
ImGui::SameLine(); ImGui::SameLine();
if (notification_draw_progress_ > 0.5f) { if (notification_draw_progress_ > 0.5f) {
ImGui::TextColored(white_color, "%s", GetDescription().c_str()); ImGui::TextColored(white_color, "%s", GetDescription().data());
} }
} }
// Restore previous style // Restore previous style

12
src/xenia/ui/imgui_host_notification.cc
View File

@@ -48,9 +48,9 @@ void HostNotificationWindow::OnDraw(ImGuiIO& io) {
return; return;
} }
const std::string longest_notification_text_line = const std::string_view longest_notification_text_line =
GetTitle().size() > GetDescription().size() ? GetTitle().c_str() GetTitle().size() > GetDescription().size() ? GetTitle()
: GetDescription().c_str(); : GetDescription();
const ImVec2 screen_size = io.DisplaySize; const ImVec2 screen_size = io.DisplaySize;
const float window_scale = const float window_scale =
@@ -59,7 +59,7 @@ void HostNotificationWindow::OnDraw(ImGuiIO& io) {
const float font_size = io.Fonts->Fonts[0]->FontSize; const float font_size = io.Fonts->Fonts[0]->FontSize;
const ImVec2 text_size = io.Fonts->Fonts[0]->CalcTextSizeA( const ImVec2 text_size = io.Fonts->Fonts[0]->CalcTextSizeA(
font_size * window_scale, FLT_MAX, -1.0f, font_size * window_scale, FLT_MAX, -1.0f,
longest_notification_text_line.c_str()); longest_notification_text_line.data());
const ImVec2 notification_size = const ImVec2 notification_size =
CalculateNotificationSize(text_size, window_scale); CalculateNotificationSize(text_size, window_scale);
@@ -78,9 +78,9 @@ void HostNotificationWindow::OnDraw(ImGuiIO& io) {
{ {
ImGui::SetWindowFontScale(window_scale); ImGui::SetWindowFontScale(window_scale);
ImGui::Text("%s", GetTitle().c_str()); ImGui::Text("%s", GetTitle().data());
ImGui::Separator(); ImGui::Separator();
ImGui::Text("%s", GetDescription().c_str()); ImGui::Text("%s", GetDescription().data());
} }
ImGui::End(); ImGui::End();
} }

8
src/xenia/ui/imgui_notification.cc
View File

@@ -27,7 +27,13 @@ ImGuiNotification::ImGuiNotification(ui::ImGuiDrawer* imgui_drawer,
description_(description), description_(description),
user_index_(user_index), user_index_(user_index),
position_(position_id), position_(position_id),
creation_time_(0) {} creation_time_(0) {
notification_text_ = title_;
if (!description_.empty()) {
notification_text_.append("\n");
notification_text_.append(description_);
}
}
ImGuiNotification::~ImGuiNotification() { ImGuiNotification::~ImGuiNotification() {
imgui_drawer_->RemoveNotification(this); imgui_drawer_->RemoveNotification(this);

15
src/xenia/ui/imgui_notification.h
View File

@@ -77,22 +77,14 @@ class ImGuiNotification {
return current_time - creation_time_ > time_to_close_; return current_time - creation_time_ > time_to_close_;
} }
const std::string GetNotificationText() const {
std::string text = title_;
if (!description_.empty()) {
text.append("\n" + description_);
}
return text;
}
void SetCreationTime(uint64_t new_creation_time) { void SetCreationTime(uint64_t new_creation_time) {
creation_time_ = new_creation_time; creation_time_ = new_creation_time;
} }
const bool IsMarkedForDeletion() const { return marked_for_deletion_; } const bool IsMarkedForDeletion() const { return marked_for_deletion_; }
const std::string GetTitle() const { return title_; } std::string_view GetTitle() const { return title_; }
const std::string GetDescription() const { return description_; } std::string_view GetDescription() const { return description_; }
std::string_view GetNotificationText() const { return notification_text_; }
const uint8_t GetPositionId() const { return position_; } const uint8_t GetPositionId() const { return position_; }
const uint8_t GetUserIndex() const { return user_index_; } const uint8_t GetUserIndex() const { return user_index_; }
@@ -123,6 +115,7 @@ class ImGuiNotification {
std::string title_; std::string title_;
std::string description_; std::string description_;
std::string notification_text_;
bool marked_for_deletion_ = false; bool marked_for_deletion_ = false;