|
|
@ -227,6 +227,7 @@ ImGuiStyle::ImGuiStyle() |
|
|
|
Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.40f, 0.40f, 0.80f, 0.40f); |
|
|
|
Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.80f, 0.50f, 0.50f, 0.40f); |
|
|
|
Colors[ImGuiCol_ComboBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.99f); |
|
|
|
Colors[ImGuiCol_CheckHovered] = ImVec4(0.60f, 0.40f, 0.40f, 1.00f); |
|
|
|
Colors[ImGuiCol_CheckActive] = ImVec4(0.90f, 0.90f, 0.90f, 0.50f); |
|
|
|
Colors[ImGuiCol_SliderGrab] = ImVec4(1.00f, 1.00f, 1.00f, 0.30f); |
|
|
|
Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.80f, 0.50f, 0.50f, 1.00f); |
|
|
@ -2168,6 +2169,7 @@ const char* GetStyleColorName(ImGuiCol idx) |
|
|
|
case ImGuiCol_ScrollbarGrabHovered: return "ScrollbarGrabHovered"; |
|
|
|
case ImGuiCol_ScrollbarGrabActive: return "ScrollbarGrabActive"; |
|
|
|
case ImGuiCol_ComboBg: return "ComboBg"; |
|
|
|
case ImGuiCol_CheckHovered: return "CheckHovered"; |
|
|
|
case ImGuiCol_CheckActive: return "CheckActive"; |
|
|
|
case ImGuiCol_SliderGrab: return "SliderGrab"; |
|
|
|
case ImGuiCol_SliderGrabActive: return "SliderGrabActive"; |
|
|
@ -3304,8 +3306,6 @@ void Checkbox(const char* label, bool* v) |
|
|
|
if (ClipAdvance(check_bb)) |
|
|
|
return; |
|
|
|
|
|
|
|
RenderFrame(check_bb.Min, check_bb.Max, window->Color(ImGuiCol_FrameBg)); |
|
|
|
|
|
|
|
const bool hovered = (g.HoveredWindow == window) && (g.HoveredId == 0) && IsMouseHoveringBox(check_bb); |
|
|
|
const bool pressed = hovered && g.IO.MouseClicked[0]; |
|
|
|
if (hovered) |
|
|
@ -3316,6 +3316,8 @@ void Checkbox(const char* label, bool* v) |
|
|
|
g.ActiveId = 0; // Clear focus
|
|
|
|
} |
|
|
|
|
|
|
|
RenderFrame(check_bb.Min, check_bb.Max, window->Color(hovered ? ImGuiCol_CheckHovered : ImGuiCol_FrameBg)); |
|
|
|
|
|
|
|
if (*v) |
|
|
|
{ |
|
|
|
window->DrawList->AddRectFilled(check_bb.Min+ImVec2(4,4), check_bb.Max-ImVec2(4,4), window->Color(ImGuiCol_CheckActive)); |
|
|
@ -3368,7 +3370,7 @@ bool RadioButton(const char* label, bool active) |
|
|
|
if (hovered) |
|
|
|
g.HoveredId = id; |
|
|
|
|
|
|
|
window->DrawList->AddCircleFilled(center, radius, window->Color(ImGuiCol_FrameBg), 16); |
|
|
|
window->DrawList->AddCircleFilled(center, radius, window->Color(hovered ? ImGuiCol_CheckHovered : ImGuiCol_FrameBg), 16); |
|
|
|
if (active) |
|
|
|
window->DrawList->AddCircleFilled(center, radius-2, window->Color(ImGuiCol_CheckActive), 16); |
|
|
|
|
|
|
|