FIX: dailytips display issue
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
Lane.Wei
parent
eb9f43c144
commit
c076fb347e
|
|
@ -62,17 +62,17 @@
|
|||
# Weight must be larger or equal to 1. Default weight is 1.
|
||||
# Weight defines probability as weight : sum_of_all_weights.
|
||||
|
||||
[hint:3D Scene Operations]
|
||||
text = 3D Scene Operations\nDid you know how to control view and object/part selection with mouse and touchpanel in the 3D scene?
|
||||
[hint:How to use keyboard shortcuts]
|
||||
text = How to use keyboard shortcuts\nBambuStudio offers a wide range of keyboard shortcuts and 3D scene operations.
|
||||
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/3d-scene-operations
|
||||
image = images/dailytips_3DScene.PNG
|
||||
|
||||
[hint:Cut Tool]
|
||||
text = Cut Tool\nDid you know that you can cut a model at any angle and position with the cutting tool?
|
||||
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/cut-tool
|
||||
image = images/dailytips_CutTool.PNG
|
||||
|
||||
[hint:Fix Model]
|
||||
text = Fix Model\nDid you know that you can fix a corrupted 3D model to avoid a lot of slicing problems?
|
||||
text = Fix Model\nDid you know that you can fix a corrupted 3D model to avoid a lot of slicing problems on the Windows system?
|
||||
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/fix-model
|
||||
|
||||
[hint:Timelapse]
|
||||
|
|
@ -180,6 +180,9 @@ text = Improve strength\nDid you know that you can use more wall loops and highe
|
|||
text = When need to print with the printer door opened\nOpening the printer door can reduce the probability of extruder/hotend clogging when printing lower temperature filament with a higher enclosure temperature. More info about this in the Wiki.
|
||||
documentation_link= https://wiki.bambulab.com/en/filament-acc/filament/heat-creep
|
||||
|
||||
[hint:Avoid warping]
|
||||
text = Avoid warping\nWhen printing materials that are prone to warping such as ABS, appropriately increasing the heatbed temperature can reduce the probability of warping.
|
||||
|
||||
#[hint:]
|
||||
#text =
|
||||
#hypertext =
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 378 KiB After Width: | Height: | Size: 378 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
|
|
@ -1,10 +1,3 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_14849_19005)">
|
||||
<path d="M1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12C22.5 14.7848 21.3938 17.4555 19.4246 19.4246C17.4555 21.3938 14.7848 22.5 12 22.5C9.21523 22.5 6.54451 21.3938 4.57538 19.4246C2.60625 17.4555 1.5 14.7848 1.5 12ZM24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 0 12 0C8.8174 0 5.76516 1.26428 3.51472 3.51472C1.26428 5.76516 0 8.8174 0 12C0 15.1826 1.26428 18.2348 3.51472 20.4853C5.76516 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12ZM6.22031 11.4703L5.69063 12L6.22031 12.5297L10.7203 17.0297L11.25 17.5594L12.3094 16.5L11.7797 15.9703L8.55938 12.75H17.25H18V11.25H17.25H8.55938L11.7797 8.02969L12.3094 7.5L11.25 6.44062L10.7203 6.97031L6.22031 11.4703Z" fill="black"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_14849_19005">
|
||||
<rect width="24" height="24" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
<path d="M1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12C22.5 14.7848 21.3938 17.4555 19.4246 19.4246C17.4555 21.3938 14.7848 22.5 12 22.5C9.21523 22.5 6.54451 21.3938 4.57538 19.4246C2.60625 17.4555 1.5 14.7848 1.5 12ZM24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 0 12 0C8.8174 0 5.76516 1.26428 3.51472 3.51472C1.26428 5.76516 0 8.8174 0 12C0 15.1826 1.26428 18.2348 3.51472 20.4853C5.76516 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12ZM6.22031 11.4703L5.69063 12L6.22031 12.5297L10.7203 17.0297L11.25 17.5594L12.3094 16.5L11.7797 15.9703L8.55938 12.75H17.25H18V11.25H17.25H8.55938L11.7797 8.02969L12.3094 7.5L11.25 6.44062L10.7203 6.97031L6.22031 11.4703Z" fill="white"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 980 B |
|
|
@ -1,3 +0,0 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12C22.5 14.7848 21.3938 17.4555 19.4246 19.4246C17.4555 21.3938 14.7848 22.5 12 22.5C9.21523 22.5 6.54451 21.3938 4.57538 19.4246C2.60625 17.4555 1.5 14.7848 1.5 12ZM24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 0 12 0C8.8174 0 5.76516 1.26428 3.51472 3.51472C1.26428 5.76516 0 8.8174 0 12C0 15.1826 1.26428 18.2348 3.51472 20.4853C5.76516 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12ZM6.22031 11.4703L5.69063 12L6.22031 12.5297L10.7203 17.0297L11.25 17.5594L12.3094 16.5L11.7797 15.9703L8.55938 12.75H17.25H18V11.25H17.25H8.55938L11.7797 8.02969L12.3094 7.5L11.25 6.44062L10.7203 6.97031L6.22031 11.4703Z" fill="#00AE42"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 982 B |
|
|
@ -1,10 +1,3 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_14849_19007)">
|
||||
<path d="M22.5 12C22.5 14.7848 21.3938 17.4555 19.4246 19.4246C17.4555 21.3938 14.7848 22.5 12 22.5C9.21523 22.5 6.54451 21.3938 4.57538 19.4246C2.60625 17.4555 1.5 14.7848 1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12ZM-8.58275e-07 12C-1.13651e-06 15.1826 1.26428 18.2348 3.51472 20.4853C5.76515 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 1.13651e-06 12 8.58275e-07C8.8174 5.80044e-07 5.76516 1.26428 3.51472 3.51472C1.26428 5.76515 -5.80044e-07 8.8174 -8.58275e-07 12ZM17.7797 12.5297L18.3094 12L17.7797 11.4703L13.2797 6.97031L12.75 6.44063L11.6906 7.5L12.2203 8.02969L15.4406 11.25L6.75 11.25L6 11.25L6 12.75L6.75 12.75L15.4406 12.75L12.2203 15.9703L11.6906 16.5L12.75 17.5594L13.2797 17.0297L17.7797 12.5297Z" fill="black"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_14849_19007">
|
||||
<rect width="24" height="24" fill="white" transform="translate(24 24) rotate(-180)"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
<path d="M22.5 12C22.5 14.7848 21.3938 17.4555 19.4246 19.4246C17.4555 21.3938 14.7848 22.5 12 22.5C9.21523 22.5 6.54451 21.3938 4.57538 19.4246C2.60625 17.4555 1.5 14.7848 1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12ZM0 12C-2.78235e-07 15.1826 1.26428 18.2348 3.51472 20.4853C5.76515 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 2.78235e-07 12 0C8.8174 -2.78231e-07 5.76516 1.26428 3.51472 3.51472C1.26428 5.76515 2.78231e-07 8.8174 0 12ZM17.7797 12.5297L18.3094 12L17.7797 11.4703L13.2797 6.97031L12.75 6.44063L11.6906 7.5L12.2203 8.02969L15.4406 11.25H6.75H6V12.75H6.75H15.4406L12.2203 15.9703L11.6906 16.5L12.75 17.5594L13.2797 17.0297L17.7797 12.5297Z" fill="white"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1019 B |
|
|
@ -1,3 +0,0 @@
|
|||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M22.5 12C22.5 14.7848 21.3938 17.4555 19.4246 19.4246C17.4555 21.3938 14.7848 22.5 12 22.5C9.21523 22.5 6.54451 21.3938 4.57538 19.4246C2.60625 17.4555 1.5 14.7848 1.5 12C1.5 9.21523 2.60625 6.54451 4.57538 4.57538C6.54451 2.60625 9.21523 1.5 12 1.5C14.7848 1.5 17.4555 2.60625 19.4246 4.57538C21.3938 6.54451 22.5 9.21523 22.5 12ZM0 12C-2.78235e-07 15.1826 1.26428 18.2348 3.51472 20.4853C5.76515 22.7357 8.8174 24 12 24C15.1826 24 18.2348 22.7357 20.4853 20.4853C22.7357 18.2348 24 15.1826 24 12C24 8.8174 22.7357 5.76516 20.4853 3.51472C18.2348 1.26428 15.1826 2.78235e-07 12 0C8.8174 -2.78231e-07 5.76516 1.26428 3.51472 3.51472C1.26428 5.76515 2.78231e-07 8.8174 0 12ZM17.7797 12.5297L18.3094 12L17.7797 11.4703L13.2797 6.97031L12.75 6.44063L11.6906 7.5L12.2203 8.02969L15.4406 11.25H6.75H6V12.75H6.75H15.4406L12.2203 15.9703L11.6906 16.5L12.75 17.5594L13.2797 17.0297L17.7797 12.5297Z" fill="#00AE42"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1021 B |
|
|
@ -1,3 +1,3 @@
|
|||
<svg width="14" height="16" viewBox="0 0 14 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.35352 14.353C7.15977 14.5468 6.84102 14.5468 6.64727 14.353L1.64727 9.35303C1.45352 9.15928 1.45352 8.84053 1.64727 8.64678C1.84102 8.45303 2.15977 8.45303 2.35352 8.64678L7.00039 13.2937L11.6473 8.64678C11.841 8.45303 12.1598 8.45303 12.3535 8.64678C12.5473 8.84053 12.5473 9.15928 12.3535 9.35303L7.35352 14.353ZM12.3535 3.35303L7.35352 8.35303C7.15977 8.54678 6.84102 8.54678 6.64727 8.35303L1.64727 3.35303C1.45352 3.15928 1.45352 2.84053 1.64727 2.64678C1.84102 2.45303 2.15977 2.45303 2.35352 2.64678L7.00039 7.29365L11.6473 2.64678C11.841 2.45303 12.1598 2.45303 12.3535 2.64678C12.5473 2.84053 12.5473 3.15928 12.3535 3.35303Z" fill="#262E30"/>
|
||||
<path d="M7.35352 14.353C7.15977 14.5468 6.84102 14.5468 6.64727 14.353L1.64727 9.35303C1.45352 9.15928 1.45352 8.84053 1.64727 8.64678C1.84102 8.45303 2.15977 8.45303 2.35352 8.64678L7.00039 13.2937L11.6473 8.64678C11.841 8.45303 12.1598 8.45303 12.3535 8.64678C12.5473 8.84053 12.5473 9.15928 12.3535 9.35303L7.35352 14.353ZM12.3535 3.35303L7.35352 8.35303C7.15977 8.54678 6.84102 8.54678 6.64727 8.35303L1.64727 3.35303C1.45352 3.15928 1.45352 2.84053 1.64727 2.64678C1.84102 2.45303 2.15977 2.45303 2.35352 2.64678L7.00039 7.29365L11.6473 2.64678C11.841 2.45303 12.1598 2.45303 12.3535 2.64678C12.5473 2.84053 12.5473 3.15928 12.3535 3.35303Z" fill="white"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 768 B After Width: | Height: | Size: 766 B |
|
|
@ -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);
|
||||
}
|
||||
|
||||
}}
|
||||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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" },
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue