|
|
|
@ -6970,7 +6970,7 @@ bool ImGui::Combo(const char* label, int* current_item, bool (*items_getter)(voi
|
|
|
|
|
|
|
|
|
|
const ImVec2 label_size = CalcTextSize(label, NULL, true);
|
|
|
|
|
const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y) + style.FramePadding*2.0f);
|
|
|
|
|
const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(style.ItemInnerSpacing.x + label_size.x,0));
|
|
|
|
|
const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f));
|
|
|
|
|
ItemSize(total_bb, style.FramePadding.y);
|
|
|
|
|
if (!ItemAdd(total_bb, &id))
|
|
|
|
|
return false;
|
|
|
|
@ -9714,7 +9714,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
|
|
|
|
|
}
|
|
|
|
|
ImGui::LogFinish();
|
|
|
|
|
}
|
|
|
|
|
ImGui::SameLine(); ImGui::PushItemWidth(150); ImGui::Combo("##output_type", &output_dest, "To Clipboard\0To TTY"); ImGui::PopItemWidth();
|
|
|
|
|
ImGui::SameLine(); ImGui::PushItemWidth(120); ImGui::Combo("##output_type", &output_dest, "To Clipboard\0To TTY"); ImGui::PopItemWidth();
|
|
|
|
|
ImGui::SameLine(); ImGui::Checkbox("Only Modified Fields", &output_only_modified);
|
|
|
|
|
|
|
|
|
|
static ImGuiColorEditMode edit_mode = ImGuiColorEditMode_RGB;
|
|
|
|
|