juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-22 10:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: dailytips display issue

Browse Source 
jira: STUDIO-4980、STUDIO-4981

1. STUDIO-4980 fix that there is a incorrect image display in first page of dailytips
2. STUDIO-4981 fix some UI element display issue in dark mode: expand
   button color、image tint color
3. modify some tips content provided by salt.wei

Change-Id: Ie85da2f049b89f0358b19f587ce7aa7cce0164c7
This commit is contained in:
liz.li
2023-10-27 19:38:29 +08:00
committed by Lane.Wei
parent eb9f43c144
commit c076fb347e
14 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/slic3r/GUI/DailyTips.cpp
View File

@@ -24,6 +24,7 @@ public:
void update_data(const DailyTipsData& data);
void render(const ImVec2& pos, const ImVec2& size) const;
bool has_image() const;
void on_change_color_mode(bool is_dark);
protected:
void load_texture_from_img_url(const std::string url);
@@ -36,6 +37,7 @@ private:
DailyTipsData m_data;
GLTexture* m_texture{ nullptr };
GLTexture* m_placeholder_texture{ nullptr };
bool m_is_dark{ false };
};
DailyTipsDataRenderer::~DailyTipsDataRenderer() {
@@ -98,12 +100,17 @@ bool DailyTipsDataRenderer::has_image() const
return !m_data.img_url.empty();
}
void DailyTipsDataRenderer::on_change_color_mode(bool is_dark)
{
m_is_dark = is_dark;
}
void DailyTipsDataRenderer::render_img(const ImVec2& start_pos, const ImVec2& size) const
{
if (has_image())
ImGui::Image((ImTextureID)(intptr_t)m_texture->get_id(), size);
ImGui::Image((ImTextureID)(intptr_t)m_texture->get_id(), size, ImVec2(0, 0), ImVec2(1, 1), m_is_dark ? ImVec4(0.8, 0.8, 0.8, 1) : ImVec4(1, 1, 1, 1));
else {
ImGui::Image((ImTextureID)(intptr_t)m_placeholder_texture->get_id(), size);
ImGui::Image((ImTextureID)(intptr_t)m_placeholder_texture->get_id(), size, ImVec2(0, 0), ImVec2(1, 1), m_is_dark ? ImVec4(0.8, 0.8, 0.8, 1) : ImVec4(1, 1, 1, 1));
}
}
@@ -200,6 +207,11 @@ void DailyTipsPanel::set_size(const ImVec2& size)
m_content_height = m_height - m_header_height - m_footer_height;
}
void DailyTipsPanel::set_can_expand(bool can_expand)
{
m_can_expand = can_expand;
}
ImVec2 DailyTipsPanel::get_size()
{
return ImVec2(m_width, m_height);
@@ -315,6 +327,12 @@ void DailyTipsPanel::set_scale(float scale)
m_scale = scale;
}
void DailyTipsPanel::on_change_color_mode(bool is_dark)
{
m_is_dark = is_dark;
m_dailytips_renderer->on_change_color_mode(is_dark);
}
void DailyTipsPanel::render_header(const ImVec2& pos, const ImVec2& size)
{
ImGuiWrapper& imgui = *wxGetApp().imgui();
@@ -378,6 +396,7 @@ void DailyTipsPanel::render_controller_buttons(const ImVec2& pos, const ImVec2&
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(.0f, .0f, .0f, .0f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(.0f, .0f, .0f, .0f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(.0f, .0f, .0f, .0f));
ImGui::PushStyleColor(ImGuiCol_Text, m_is_dark ? ImColor(230, 230, 230).Value : ImColor(38, 46, 48).Value);
// for bold font text, split text and icon-font button
imgui.push_bold_font();
@@ -385,7 +404,6 @@ void DailyTipsPanel::render_controller_buttons(const ImVec2& pos, const ImVec2&
imgui.pop_bold_font();
ImVec2 expand_btn_size = ImGui::CalcTextSize((_u8L("Daily Tips")).c_str());
ImGui::SetCursorScreenPos(ImVec2(btn_pos.x + expand_btn_size.x + ImGui::CalcTextSize(" ").x, btn_pos.y));
std::wstring button_text;
button_text = ImGui::ExpandArrowIcon;
imgui.button(button_text.c_str());
expand_btn_size.x += 19.0f * m_scale;
@@ -397,13 +415,13 @@ void DailyTipsPanel::render_controller_buttons(const ImVec2& pos, const ImVec2&
lineEnd.y -= 2;
ImVec2 lineStart = lineEnd;
lineStart.x = ImGui::GetItemRectMin().x - expand_btn_size.x;
ImGui::GetWindowDrawList()->AddLine(lineStart, lineEnd, ImColor(38, 46, 48));
ImGui::GetWindowDrawList()->AddLine(lineStart, lineEnd, m_is_dark ? ImColor(230, 230, 230) : ImColor(38, 46, 48));
if (ImGui::IsMouseClicked(ImGuiMouseButton_Left))
expand();
}
ImGui::PopStyleColor(3);
ImGui::PopStyleColor(4);
ImGui::EndChild();
return;
@@ -426,33 +444,38 @@ void DailyTipsPanel::render_controller_buttons(const ImVec2& pos, const ImVec2&
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(.0f, .0f, .0f, .0f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(.0f, .0f, .0f, .0f));
ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(.0f, .0f, .0f, .0f));
ImGui::PushStyleColor(ImGuiCol_Text, ImColor(255, 255, 255).Value);// for icon-font button
// prev button
ImColor button_text_color = m_is_dark ? ImColor(228, 228, 228) : ImColor(38, 46, 48);
ImVec2 prev_button_pos = pos + size + ImVec2(-button_margin_x - button_size.x * 2, -size.y);
ImGui::SetCursorScreenPos(prev_button_pos);
button_text = ImGui::PrevArrowBtnIcon;
if (ImGui::IsMouseHoveringRect(prev_button_pos, prev_button_pos + button_size, true))
{
button_text = ImGui::PrevArrowHoverBtnIcon;
button_text_color = ImColor(0, 174, 66);
if (ImGui::IsMouseClicked(ImGuiMouseButton_Left))
retrieve_data_from_hint_database(HintDataNavigation::Prev);
}
ImGui::PushStyleColor(ImGuiCol_Text, button_text_color.Value);// for icon-font button
imgui.button(button_text.c_str());
ImGui::PopStyleColor();
// next button
button_text_color = m_is_dark ? ImColor(228, 228, 228) : ImColor(38, 46, 48);
ImVec2 next_button_pos = pos + size + ImVec2(-button_size.x, -size.y);
ImGui::SetCursorScreenPos(next_button_pos);
button_text = ImGui::NextArrowBtnIcon;
if (ImGui::IsMouseHoveringRect(next_button_pos, next_button_pos + button_size, true))
{
button_text = ImGui::NextArrowHoverBtnIcon;
button_text_color = ImColor(0, 174, 66);
if (ImGui::IsMouseClicked(ImGuiMouseButton_Left))
retrieve_data_from_hint_database(HintDataNavigation::Next);
}
ImGui::PushStyleColor(ImGuiCol_Text, button_text_color.Value);// for icon-font button
imgui.button(button_text.c_str());
ImGui::PopStyleColor(5);
ImGui::PopStyleColor();
ImGui::PopStyleColor(4);
}
ImGui::EndChild();
}
@@ -555,6 +578,7 @@ void DailyTipsWindow::set_scale(float scale)
void DailyTipsWindow::on_change_color_mode(bool is_dark)
{
m_is_dark = is_dark;
m_panel->on_change_color_mode(is_dark);
}
}}

3
src/slic3r/GUI/DailyTips.hpp
View File

@@ -18,6 +18,7 @@ public:
DailyTipsPanel(const ImVec2& pos, const ImVec2& size, bool can_expand = true);
void set_position(const ImVec2& pos);
void set_size(const ImVec2& size);
void set_can_expand(bool can_expand);
ImVec2 get_size();
void render();
void retrieve_data_from_hint_database(HintDataNavigation nav);
@@ -25,6 +26,7 @@ public:
void collapse();
bool is_expanded();
void set_scale(float scale);
void on_change_color_mode(bool is_dark);
protected:
void render_header(const ImVec2& pos, const ImVec2& size);
@@ -47,6 +49,7 @@ private:
int m_uid;
bool m_first_enter{ false };
float m_scale = 1.0f;
bool m_is_dark{ false };
};
class DailyTipsWindow {

2
src/slic3r/GUI/ImGuiWrapper.cpp
View File

@@ -124,9 +124,7 @@ static const std::map<const wchar_t, std::string> font_icons_large = {
//{ImGui::DocumentationHoverDarkButton, "notification_documentation_hover_dark"},
{ImGui::BlockNotifErrorIcon, "block_notification_error" },
{ImGui::PrevArrowBtnIcon, "notification_arrow_left" },
{ImGui::PrevArrowHoverBtnIcon, "notification_arrow_left_hovered" },
{ImGui::NextArrowBtnIcon, "notification_arrow_right" },
{ImGui::NextArrowHoverBtnIcon, "notification_arrow_right_hovered" },
{ImGui::CompleteIcon, "notification_slicing_complete" },
};

2
src/slic3r/GUI/NotificationManager.hpp
View File

@@ -415,7 +415,7 @@ private:
// set start of notification to now. Used by delayed notifications
void reset_timer() { m_notification_start = GLCanvas3D::timestamp_now(); m_state = EState::Shown; }
void set_Multiline(bool Multi) { m_multiline = Multi; }
void on_change_color_mode(bool is_dark);
virtual void on_change_color_mode(bool is_dark);
void set_scale(float scale) { m_scale = scale; }
protected:

10
src/slic3r/GUI/SlicingProgressNotification.cpp
View File

@@ -20,6 +20,12 @@ namespace {
static constexpr int BEFORE_COMPLETE_DURATION = 3000; //ms
static constexpr int REFRESH_TIMEOUT = 100; //ms
void NotificationManager::SlicingProgressNotification::on_change_color_mode(bool is_dark)
{
PopNotification::on_change_color_mode(is_dark);
m_dailytips_panel->on_change_color_mode(is_dark);
}
void NotificationManager::SlicingProgressNotification::init()
{
if (m_sp_state == SlicingProgressState::SP_PROGRESS) {
@@ -413,6 +419,10 @@ void Slic3r::GUI::NotificationManager::SlicingProgressNotification::render_bar(c
void NotificationManager::SlicingProgressNotification::render_dailytips_panel(const ImVec2& pos, const ImVec2& size)
{
if (m_sp_state == SlicingProgressState::SP_BEFORE_COMPLETED)
m_dailytips_panel->set_can_expand(false);
else
m_dailytips_panel->set_can_expand(true);
m_dailytips_panel->set_scale(m_scale);
m_dailytips_panel->set_position(pos);
m_dailytips_panel->set_size(size);

1
src/slic3r/GUI/SlicingProgressNotification.hpp
View File

@@ -48,6 +48,7 @@ public:
// Switch between technology to provide correct text.
void set_fff(bool b) { m_is_fff = b; }
void set_export_possible(bool b) { m_export_possible = b; }
void on_change_color_mode(bool is_dark) override;
protected:
void init() override;
void render(GLCanvas3D& canvas, float initial_y, bool move_from_overlay, float overlay_width, float right_margin) override;