Skip to content

Commit e362c5a

Browse files
ocornutocornut
committed
Internals: ColorEdit: renamed some internal masks to match our common coding style.
ImGuiColorEditFlags__DisplayMask > ImGuiColorEditFlags_DisplayMask_, ImGuiColorEditFlags__OptionsDefault > ImGuiColorEditFlags_DefaultOptions_, ImGuiColorEditFlags__DataTypeMask > ImGuiColorEditFlags_DataTypeMask_ etc.
1 parent 923bd2f commit e362c5a

File tree

3 files changed

+56
-56
lines changed

3 files changed

+56
-56
lines changed

‎imgui.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Index of this file:
6161
// Version
6262
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
6363
#define IMGUI_VERSION "1.84 WIP"
64-
#define IMGUI_VERSION_NUM 18311
64+
#define IMGUI_VERSION_NUM 18312
6565
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
6666
#define IMGUI_HAS_TABLE
6767

@@ -1564,13 +1564,13 @@ enum ImGuiColorEditFlags_
15641564

15651565
// Defaults Options. You can set application defaults using SetColorEditOptions(). The intent is that you probably don't want to
15661566
// override them in most of your calls. Let the user choose via the option menu and/or call SetColorEditOptions() once during startup.
1567-
ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_PickerHueBar,
1567+
ImGuiColorEditFlags_DefaultOptions_ = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_PickerHueBar,
15681568

15691569
// [Internal] Masks
1570-
ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_DisplayHex,
1571-
ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_Float,
1572-
ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_PickerHueBar,
1573-
ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_InputHSV
1570+
ImGuiColorEditFlags_DisplayMask_ = ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_DisplayHex,
1571+
ImGuiColorEditFlags_DataTypeMask_ = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_Float,
1572+
ImGuiColorEditFlags_PickerMask_ = ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_PickerHueBar,
1573+
ImGuiColorEditFlags_InputMask_ = ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_InputHSV
15741574

15751575
// Obsolete names (will be removed)
15761576
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS

‎imgui_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ struct ImGuiContext
17651765

17661766
LastValidMousePos = ImVec2(0.0f, 0.0f);
17671767
TempInputId = 0;
1768-
ColorEditOptions = ImGuiColorEditFlags__OptionsDefault;
1768+
ColorEditOptions = ImGuiColorEditFlags_DefaultOptions_;
17691769
ColorEditLastHue = ColorEditLastSat = 0.0f;
17701770
ColorEditLastColor[0] = ColorEditLastColor[1] = ColorEditLastColor[2] = FLT_MAX;
17711771
SliderCurrentAccum = 0.0f;

‎imgui_widgets.cpp

+49-49
Original file line numberDiff line numberDiff line change
@@ -4777,24 +4777,24 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
47774777
// If we're not showing any slider there's no point in doing any HSV conversions
47784778
const ImGuiColorEditFlags flags_untouched = flags;
47794779
if (flags & ImGuiColorEditFlags_NoInputs)
4780-
flags = (flags & (~ImGuiColorEditFlags__DisplayMask)) | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_NoOptions;
4780+
flags = (flags & (~ImGuiColorEditFlags_DisplayMask_)) | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_NoOptions;
47814781

47824782
// Context menu: display and modify options (before defaults are applied)
47834783
if (!(flags & ImGuiColorEditFlags_NoOptions))
47844784
ColorEditOptionsPopup(col, flags);
47854785

47864786
// Read stored options
4787-
if (!(flags & ImGuiColorEditFlags__DisplayMask))
4788-
flags |= (g.ColorEditOptions & ImGuiColorEditFlags__DisplayMask);
4789-
if (!(flags & ImGuiColorEditFlags__DataTypeMask))
4790-
flags |= (g.ColorEditOptions & ImGuiColorEditFlags__DataTypeMask);
4791-
if (!(flags & ImGuiColorEditFlags__PickerMask))
4792-
flags |= (g.ColorEditOptions & ImGuiColorEditFlags__PickerMask);
4793-
if (!(flags & ImGuiColorEditFlags__InputMask))
4794-
flags |= (g.ColorEditOptions & ImGuiColorEditFlags__InputMask);
4795-
flags |= (g.ColorEditOptions & ~(ImGuiColorEditFlags__DisplayMask | ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__PickerMask | ImGuiColorEditFlags__InputMask));
4796-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DisplayMask)); // Check that only 1 is selected
4797-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask)); // Check that only 1 is selected
4787+
if (!(flags & ImGuiColorEditFlags_DisplayMask_))
4788+
flags |= (g.ColorEditOptions & ImGuiColorEditFlags_DisplayMask_);
4789+
if (!(flags & ImGuiColorEditFlags_DataTypeMask_))
4790+
flags |= (g.ColorEditOptions & ImGuiColorEditFlags_DataTypeMask_);
4791+
if (!(flags & ImGuiColorEditFlags_PickerMask_))
4792+
flags |= (g.ColorEditOptions & ImGuiColorEditFlags_PickerMask_);
4793+
if (!(flags & ImGuiColorEditFlags_InputMask_))
4794+
flags |= (g.ColorEditOptions & ImGuiColorEditFlags_InputMask_);
4795+
flags |= (g.ColorEditOptions & ~(ImGuiColorEditFlags_DisplayMask_ | ImGuiColorEditFlags_DataTypeMask_ | ImGuiColorEditFlags_PickerMask_ | ImGuiColorEditFlags_InputMask_));
4796+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_DisplayMask_)); // Check that only 1 is selected
4797+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_InputMask_)); // Check that only 1 is selected
47984798

47994799
const bool alpha = (flags & ImGuiColorEditFlags_NoAlpha) == 0;
48004800
const bool hdr = (flags & ImGuiColorEditFlags_HDR) != 0;
@@ -4923,8 +4923,8 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
49234923
TextEx(label, label_display_end);
49244924
Spacing();
49254925
}
4926-
ImGuiColorEditFlags picker_flags_to_forward = ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__PickerMask | ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaBar;
4927-
ImGuiColorEditFlags picker_flags = (flags_untouched & picker_flags_to_forward) | ImGuiColorEditFlags__DisplayMask | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf;
4926+
ImGuiColorEditFlags picker_flags_to_forward = ImGuiColorEditFlags_DataTypeMask_ | ImGuiColorEditFlags_PickerMask_ | ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaBar;
4927+
ImGuiColorEditFlags picker_flags = (flags_untouched & picker_flags_to_forward) | ImGuiColorEditFlags_DisplayMask_ | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf;
49284928
SetNextItemWidth(square_sz * 12.0f); // Use 256 + bar sizes?
49294929
value_changed |= ColorPicker4("##picker", col, picker_flags, &g.ColorPickerRef.x);
49304930
EndPopup();
@@ -5044,12 +5044,12 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
50445044
ColorPickerOptionsPopup(col, flags);
50455045

50465046
// Read stored options
5047-
if (!(flags & ImGuiColorEditFlags__PickerMask))
5048-
flags |= ((g.ColorEditOptions & ImGuiColorEditFlags__PickerMask) ? g.ColorEditOptions : ImGuiColorEditFlags__OptionsDefault) & ImGuiColorEditFlags__PickerMask;
5049-
if (!(flags & ImGuiColorEditFlags__InputMask))
5050-
flags |= ((g.ColorEditOptions & ImGuiColorEditFlags__InputMask) ? g.ColorEditOptions : ImGuiColorEditFlags__OptionsDefault) & ImGuiColorEditFlags__InputMask;
5051-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__PickerMask)); // Check that only 1 is selected
5052-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask)); // Check that only 1 is selected
5047+
if (!(flags & ImGuiColorEditFlags_PickerMask_))
5048+
flags |= ((g.ColorEditOptions & ImGuiColorEditFlags_PickerMask_) ? g.ColorEditOptions : ImGuiColorEditFlags_DefaultOptions_) & ImGuiColorEditFlags_PickerMask_;
5049+
if (!(flags & ImGuiColorEditFlags_InputMask_))
5050+
flags |= ((g.ColorEditOptions & ImGuiColorEditFlags_InputMask_) ? g.ColorEditOptions : ImGuiColorEditFlags_DefaultOptions_) & ImGuiColorEditFlags_InputMask_;
5051+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_PickerMask_)); // Check that only 1 is selected
5052+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_InputMask_)); // Check that only 1 is selected
50535053
if (!(flags & ImGuiColorEditFlags_NoOptions))
50545054
flags |= (g.ColorEditOptions & ImGuiColorEditFlags_AlphaBar);
50555055

@@ -5195,7 +5195,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
51955195
if ((flags & ImGuiColorEditFlags_NoLabel))
51965196
Text("Current");
51975197

5198-
ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_NoTooltip;
5198+
ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_NoTooltip;
51995199
ColorButton("##current", col_v4, (flags & sub_flags_to_forward), ImVec2(square_sz * 3, square_sz * 2));
52005200
if (ref_col != NULL)
52015201
{
@@ -5234,19 +5234,19 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
52345234
if ((flags & ImGuiColorEditFlags_NoInputs) == 0)
52355235
{
52365236
PushItemWidth((alpha_bar ? bar1_pos_x : bar0_pos_x) + bars_width - picker_pos.x);
5237-
ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoSmallPreview | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf;
5237+
ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags_DataTypeMask_ | ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoSmallPreview | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf;
52385238
ImGuiColorEditFlags sub_flags = (flags & sub_flags_to_forward) | ImGuiColorEditFlags_NoPicker;
5239-
if (flags & ImGuiColorEditFlags_DisplayRGB || (flags & ImGuiColorEditFlags__DisplayMask) == 0)
5239+
if (flags & ImGuiColorEditFlags_DisplayRGB || (flags & ImGuiColorEditFlags_DisplayMask_) == 0)
52405240
if (ColorEdit4("##rgb", col, sub_flags | ImGuiColorEditFlags_DisplayRGB))
52415241
{
52425242
// FIXME: Hackily differentiating using the DragInt (ActiveId != 0 && !ActiveIdAllowOverlap) vs. using the InputText or DropTarget.
52435243
// For the later we don't want to run the hue-wrap canceling code. If you are well versed in HSV picker please provide your input! (See #2050)
52445244
value_changed_fix_hue_wrap = (g.ActiveId != 0 && !g.ActiveIdAllowOverlap);
52455245
value_changed = true;
52465246
}
5247-
if (flags & ImGuiColorEditFlags_DisplayHSV || (flags & ImGuiColorEditFlags__DisplayMask) == 0)
5247+
if (flags & ImGuiColorEditFlags_DisplayHSV || (flags & ImGuiColorEditFlags_DisplayMask_) == 0)
52485248
value_changed |= ColorEdit4("##hsv", col, sub_flags | ImGuiColorEditFlags_DisplayHSV);
5249-
if (flags & ImGuiColorEditFlags_DisplayHex || (flags & ImGuiColorEditFlags__DisplayMask) == 0)
5249+
if (flags & ImGuiColorEditFlags_DisplayHex || (flags & ImGuiColorEditFlags_DisplayMask_) == 0)
52505250
value_changed |= ColorEdit4("##hex", col, sub_flags | ImGuiColorEditFlags_DisplayHex);
52515251
PopItemWidth();
52525252
}
@@ -5476,7 +5476,7 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl
54765476

54775477
// Tooltip
54785478
if (!(flags & ImGuiColorEditFlags_NoTooltip) && hovered)
5479-
ColorTooltip(desc_id, &col.x, flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf));
5479+
ColorTooltip(desc_id, &col.x, flags & (ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf));
54805480

54815481
return pressed;
54825482
}
@@ -5485,18 +5485,18 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl
54855485
void ImGui::SetColorEditOptions(ImGuiColorEditFlags flags)
54865486
{
54875487
ImGuiContext& g = *GImGui;
5488-
if ((flags & ImGuiColorEditFlags__DisplayMask) == 0)
5489-
flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__DisplayMask;
5490-
if ((flags & ImGuiColorEditFlags__DataTypeMask) == 0)
5491-
flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__DataTypeMask;
5492-
if ((flags & ImGuiColorEditFlags__PickerMask) == 0)
5493-
flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__PickerMask;
5494-
if ((flags & ImGuiColorEditFlags__InputMask) == 0)
5495-
flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__InputMask;
5496-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DisplayMask)); // Check only 1 option is selected
5497-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DataTypeMask)); // Check only 1 option is selected
5498-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__PickerMask)); // Check only 1 option is selected
5499-
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask)); // Check only 1 option is selected
5488+
if ((flags & ImGuiColorEditFlags_DisplayMask_) == 0)
5489+
flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_DisplayMask_;
5490+
if ((flags & ImGuiColorEditFlags_DataTypeMask_) == 0)
5491+
flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_DataTypeMask_;
5492+
if ((flags & ImGuiColorEditFlags_PickerMask_) == 0)
5493+
flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_PickerMask_;
5494+
if ((flags & ImGuiColorEditFlags_InputMask_) == 0)
5495+
flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_InputMask_;
5496+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_DisplayMask_)); // Check only 1 option is selected
5497+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_DataTypeMask_)); // Check only 1 option is selected
5498+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_PickerMask_)); // Check only 1 option is selected
5499+
IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_InputMask_)); // Check only 1 option is selected
55005500
g.ColorEditOptions = flags;
55015501
}
55025502

@@ -5516,9 +5516,9 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags
55165516
ImVec2 sz(g.FontSize * 3 + g.Style.FramePadding.y * 2, g.FontSize * 3 + g.Style.FramePadding.y * 2);
55175517
ImVec4 cf(col[0], col[1], col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : col[3]);
55185518
int cr = IM_F32_TO_INT8_SAT(col[0]), cg = IM_F32_TO_INT8_SAT(col[1]), cb = IM_F32_TO_INT8_SAT(col[2]), ca = (flags & ImGuiColorEditFlags_NoAlpha) ? 255 : IM_F32_TO_INT8_SAT(col[3]);
5519-
ColorButton("##preview", cf, (flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf)) | ImGuiColorEditFlags_NoTooltip, sz);
5519+
ColorButton("##preview", cf, (flags & (ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf)) | ImGuiColorEditFlags_NoTooltip, sz);
55205520
SameLine();
5521-
if ((flags & ImGuiColorEditFlags_InputRGB) || !(flags & ImGuiColorEditFlags__InputMask))
5521+
if ((flags & ImGuiColorEditFlags_InputRGB) || !(flags & ImGuiColorEditFlags_InputMask_))
55225522
{
55235523
if (flags & ImGuiColorEditFlags_NoAlpha)
55245524
Text("#%02X%02X%02X\nR: %d, G: %d, B: %d\n(%.3f, %.3f, %.3f)", cr, cg, cb, cr, cg, cb, col[0], col[1], col[2]);
@@ -5537,23 +5537,23 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags
55375537

55385538
void ImGui::ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags)
55395539
{
5540-
bool allow_opt_inputs = !(flags & ImGuiColorEditFlags__DisplayMask);
5541-
bool allow_opt_datatype = !(flags & ImGuiColorEditFlags__DataTypeMask);
5540+
bool allow_opt_inputs = !(flags & ImGuiColorEditFlags_DisplayMask_);
5541+
bool allow_opt_datatype = !(flags & ImGuiColorEditFlags_DataTypeMask_);
55425542
if ((!allow_opt_inputs && !allow_opt_datatype) || !BeginPopup("context"))
55435543
return;
55445544
ImGuiContext& g = *GImGui;
55455545
ImGuiColorEditFlags opts = g.ColorEditOptions;
55465546
if (allow_opt_inputs)
55475547
{
5548-
if (RadioButton("RGB", (opts & ImGuiColorEditFlags_DisplayRGB) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayRGB;
5549-
if (RadioButton("HSV", (opts & ImGuiColorEditFlags_DisplayHSV) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayHSV;
5550-
if (RadioButton("Hex", (opts & ImGuiColorEditFlags_DisplayHex) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayHex;
5548+
if (RadioButton("RGB", (opts & ImGuiColorEditFlags_DisplayRGB) != 0)) opts = (opts & ~ImGuiColorEditFlags_DisplayMask_) | ImGuiColorEditFlags_DisplayRGB;
5549+
if (RadioButton("HSV", (opts & ImGuiColorEditFlags_DisplayHSV) != 0)) opts = (opts & ~ImGuiColorEditFlags_DisplayMask_) | ImGuiColorEditFlags_DisplayHSV;
5550+
if (RadioButton("Hex", (opts & ImGuiColorEditFlags_DisplayHex) != 0)) opts = (opts & ~ImGuiColorEditFlags_DisplayMask_) | ImGuiColorEditFlags_DisplayHex;
55515551
}
55525552
if (allow_opt_datatype)
55535553
{
55545554
if (allow_opt_inputs) Separator();
5555-
if (RadioButton("0..255", (opts & ImGuiColorEditFlags_Uint8) != 0)) opts = (opts & ~ImGuiColorEditFlags__DataTypeMask) | ImGuiColorEditFlags_Uint8;
5556-
if (RadioButton("0.00..1.00", (opts & ImGuiColorEditFlags_Float) != 0)) opts = (opts & ~ImGuiColorEditFlags__DataTypeMask) | ImGuiColorEditFlags_Float;
5555+
if (RadioButton("0..255", (opts & ImGuiColorEditFlags_Uint8) != 0)) opts = (opts & ~ImGuiColorEditFlags_DataTypeMask_) | ImGuiColorEditFlags_Uint8;
5556+
if (RadioButton("0.00..1.00", (opts & ImGuiColorEditFlags_Float) != 0)) opts = (opts & ~ImGuiColorEditFlags_DataTypeMask_) | ImGuiColorEditFlags_Float;
55575557
}
55585558

55595559
if (allow_opt_inputs || allow_opt_datatype)
@@ -5588,7 +5588,7 @@ void ImGui::ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags)
55885588

55895589
void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags)
55905590
{
5591-
bool allow_opt_picker = !(flags & ImGuiColorEditFlags__PickerMask);
5591+
bool allow_opt_picker = !(flags & ImGuiColorEditFlags_PickerMask_);
55925592
bool allow_opt_alpha_bar = !(flags & ImGuiColorEditFlags_NoAlpha) && !(flags & ImGuiColorEditFlags_AlphaBar);
55935593
if ((!allow_opt_picker && !allow_opt_alpha_bar) || !BeginPopup("context"))
55945594
return;
@@ -5607,7 +5607,7 @@ void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags fl
56075607
if (picker_type == 1) picker_flags |= ImGuiColorEditFlags_PickerHueWheel;
56085608
ImVec2 backup_pos = GetCursorScreenPos();
56095609
if (Selectable("##selectable", false, 0, picker_size)) // By default, Selectable() is closing popup
5610-
g.ColorEditOptions = (g.ColorEditOptions & ~ImGuiColorEditFlags__PickerMask) | (picker_flags & ImGuiColorEditFlags__PickerMask);
5610+
g.ColorEditOptions = (g.ColorEditOptions & ~ImGuiColorEditFlags_PickerMask_) | (picker_flags & ImGuiColorEditFlags_PickerMask_);
56115611
SetCursorScreenPos(backup_pos);
56125612
ImVec4 previewing_ref_col;
56135613
memcpy(&previewing_ref_col, ref_col, sizeof(float) * ((picker_flags & ImGuiColorEditFlags_NoAlpha) ? 3 : 4));

0 commit comments

Comments
 (0)