Skip to content

fix preset combo #424

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 3 commits into from
Aug 29, 2022
Merged

fix preset combo #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea6466d
fix preset combo
astrowander Aug 29, 2022
2b46141
Revert "fix preset combo"
astrowander Aug 29, 2022
a649e17
fix arrow position
astrowander Aug 29, 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 @@ -661,7 +661,7 @@ PaletteChanges Palette(
{
ImGui::SetNextItemWidth( scaledWidth );
int presetIndex = -1;
if ( RibbonButtonDrawer::CustomCombo( "Load preset", &presetIndex, presets ) )
if ( RibbonButtonDrawer::CustomCombo( "Load preset", &presetIndex, presets, false ) )
{
if ( presetIndex != -1 )
PalettePresets::loadPreset( presets[presetIndex], palette );
Expand Down
2 changes: 1 addition & 1 deletion source/MRViewer/MRRibbonButtonDrawer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ bool RibbonButtonDrawer::CustomCombo( const char* label, int* v, const std::vect
const ImVec2 pos = window->DC.CursorPos;
const float arrowSize = 2 * style.FramePadding.y + ImGui::GetTextLineHeight();
if ( !showPreview )
ImGui::PushItemWidth( arrowSize );
ImGui::PushItemWidth( arrowSize + style.FramePadding.x * 0.5f );

float itemWidth = ( context->NextItemData.Flags & ImGuiNextItemDataFlags_HasWidth ) ? context->NextItemData.Width : window->DC.ItemWidth;

Expand Down