After merge fix
This commit is contained in:
parent
737117e474
commit
a30a254724
@ -56,6 +56,10 @@ static const std::map<const wchar_t, std::string> font_icons = {
|
|||||||
{ImGui::PreferencesHoverButton, "notification_preferences_hover"},
|
{ImGui::PreferencesHoverButton, "notification_preferences_hover"},
|
||||||
{ImGui::SliderFloatEditBtnIcon, "edit_button" },
|
{ImGui::SliderFloatEditBtnIcon, "edit_button" },
|
||||||
{ImGui::SliderFloatEditBtnPressedIcon, "edit_button_pressed" },
|
{ImGui::SliderFloatEditBtnPressedIcon, "edit_button_pressed" },
|
||||||
|
{ImGui::ExpandBtn , "expand_btn" },
|
||||||
|
{ImGui::CollapseBtn , "collapse_btn" },
|
||||||
|
{ImGui::RevertButton , "undo" },
|
||||||
|
{ImGui::WarningMarkerSmall , "notification_warning" },
|
||||||
};
|
};
|
||||||
|
|
||||||
static const std::map<const wchar_t, std::string> font_icons_large = {
|
static const std::map<const wchar_t, std::string> font_icons_large = {
|
||||||
@ -73,10 +77,6 @@ static const std::map<const wchar_t, std::string> font_icons_large = {
|
|||||||
{ImGui::LegendShells , "legend_shells" },
|
{ImGui::LegendShells , "legend_shells" },
|
||||||
{ImGui::LegendToolMarker , "legend_toolmarker" },
|
{ImGui::LegendToolMarker , "legend_toolmarker" },
|
||||||
#endif // ENABLE_LEGEND_TOOLBAR_ICONS
|
#endif // ENABLE_LEGEND_TOOLBAR_ICONS
|
||||||
{ImGui::RevertButton , "undo" },
|
|
||||||
{ImGui::WarningMarkerSmall , "notification_warning" },
|
|
||||||
{ImGui::ExpandBtn , "expand_btn" },
|
|
||||||
{ImGui::CollapseBtn , "collapse_btn" },
|
|
||||||
{ImGui::CloseNotifButton , "notification_close" },
|
{ImGui::CloseNotifButton , "notification_close" },
|
||||||
{ImGui::CloseNotifHoverButton , "notification_close_hover" },
|
{ImGui::CloseNotifHoverButton , "notification_close_hover" },
|
||||||
{ImGui::EjectButton , "notification_eject_sd" },
|
{ImGui::EjectButton , "notification_eject_sd" },
|
||||||
|
Loading…
Reference in New Issue
Block a user