Skip to content

fix marks in CheckBox & ComboBox, #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrowander merged 2 commits into from
Aug 26, 2022
Merged

fix marks in CheckBox & ComboBox, #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1d6b75
fix marks in CheckBox & ComboBox,
astrowander Aug 26, 2022
5d47ae2
code review
astrowander Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/MRViewer/ImGuiHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ PaletteChanges Palette(
{
ImGui::SetNextItemWidth( scaledWidth );
int presetIndex = -1;
if ( RibbonButtonDrawer::CustomCombo( "Load palette preset", &presetIndex, presets, false ) )
if ( RibbonButtonDrawer::CustomCombo( "Load preset", &presetIndex, presets ) )
{
if ( presetIndex != -1 )
PalettePresets::loadPreset( presets[presetIndex], palette );
Expand Down
39 changes: 28 additions & 11 deletions source/MRViewer/MRRibbonButtonDrawer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,25 @@ bool RibbonButtonDrawer::GradientCheckbox( const char* label, bool* value )
const float pad = ImMax( 1.0f, IM_FLOOR( square_sz / 6.0f ) );
auto renderCustomCheckmark = [] ( ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz )
{
float thickness = ImMax( sz * 0.15f, 1.0f );
const float thickness = ImMax( sz * 0.15f, 1.0f );
sz -= thickness * 0.5f;
pos = ImVec2( pos.x + thickness * 0.25f, pos.y + thickness * 0.25f );

float half = sz * 0.5f;
float ninth = sz / 9.0f;
draw_list->PathLineTo( ImVec2( pos.x + ninth, pos.y + half ) );
draw_list->PathLineTo( ImVec2( pos.x + half, pos.y + sz - ninth ) );
draw_list->PathLineTo( ImVec2( pos.x + sz - ninth, pos.y + ninth * 2.0f ) );
const float half = sz * 0.5f;
const float ninth = sz / 9.0f;
const ImVec2 startPoint { pos.x + ninth, pos.y + half };
const ImVec2 anglePoint { pos.x + half, pos.y + sz - ninth };
const ImVec2 endPoint { pos.x + sz - ninth, pos.y + ninth * 2.0f };

draw_list->PathLineTo( startPoint );
draw_list->PathLineTo( anglePoint );
draw_list->PathLineTo( endPoint );
draw_list->PathStroke( col, 0, thickness );

const float radius = thickness * 0.5f;
draw_list->AddCircleFilled( startPoint, radius, col );
draw_list->AddCircleFilled( anglePoint, radius, col );
draw_list->AddCircleFilled( endPoint, radius, col );
};
renderCustomCheckmark( window->DrawList, { check_bb.Min.x + pad, check_bb.Min.y + pad }, check_col, square_sz - pad * 2.0f );
}
Expand Down Expand Up @@ -339,12 +348,20 @@ bool RibbonButtonDrawer::CustomCombo( const char* label, int* v, const std::vect
const float sixthWidth = arrowBox.GetWidth() / 6.0f;

const float thickness = ImMax( arrowBox.GetHeight() * 0.1f, 1.0f );
const ImVec2 pos = { arrowBox.Min.x, arrowBox.Min.y - thickness };
draw_list->PathLineTo( ImVec2( pos.x + sixthWidth, pos.y + halfHeight ) );
draw_list->PathLineTo( ImVec2( pos.x + 2 * sixthWidth, pos.y + halfHeight + seventhHeight ) );
draw_list->PathLineTo( ImVec2( pos.x + 3 * sixthWidth, pos.y + halfHeight ) );

const ImVec2 pos { arrowBox.Min.x, arrowBox.Min.y - thickness };
const ImVec2 startPoint { pos.x + sixthWidth, pos.y + halfHeight };
const ImVec2 anglePoint { pos.x + 2 * sixthWidth, pos.y + halfHeight + seventhHeight };
const ImVec2 endPoint { pos.x + 3 * sixthWidth, pos.y + halfHeight };

draw_list->PathLineTo( startPoint );
draw_list->PathLineTo( anglePoint );
draw_list->PathLineTo( endPoint );
draw_list->PathStroke( col, 0, thickness );

const float radius = thickness * 0.5f;
draw_list->AddCircleFilled( startPoint, radius, col );
draw_list->AddCircleFilled( anglePoint, radius, col );
draw_list->AddCircleFilled( endPoint, radius, col );
};

renderCustomArrow( window->DrawList, arrowBox, ImGui::GetColorU32( ImGuiCol_Text ) );
Expand Down