@@ -867,11 +867,12 @@ bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos)
867
867
if (hovered)
868
868
window->DrawList->AddRectFilled(bb.Min, bb.Max, bg_col);
869
869
RenderNavCursor(bb, id, ImGuiNavRenderCursorFlags_Compact);
870
- ImU32 cross_col = GetColorU32(ImGuiCol_Text);
871
- ImVec2 cross_center = bb.GetCenter() - ImVec2(0.5f, 0.5f);
872
- float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f;
873
- window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, +cross_extent), cross_center + ImVec2(-cross_extent, -cross_extent), cross_col, 1.0f);
874
- window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, -cross_extent), cross_center + ImVec2(-cross_extent, +cross_extent), cross_col, 1.0f);
870
+ const ImU32 cross_col = GetColorU32(ImGuiCol_Text);
871
+ const ImVec2 cross_center = bb.GetCenter() - ImVec2(0.5f, 0.5f);
872
+ const float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f;
873
+ const float cross_thickness = 1.0f; // FIXME-DPI
874
+ window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, +cross_extent), cross_center + ImVec2(-cross_extent, -cross_extent), cross_col, cross_thickness);
875
+ window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, -cross_extent), cross_center + ImVec2(-cross_extent, +cross_extent), cross_col, cross_thickness);
875
876
876
877
return pressed;
877
878
}
@@ -1478,7 +1479,7 @@ bool ImGui::TextLink(const char* label)
1478
1479
}
1479
1480
1480
1481
float line_y = bb.Max.y + ImFloor(g.Font->Descent * g.FontScale * 0.20f);
1481
- window->DrawList->AddLine(ImVec2(bb.Min.x, line_y), ImVec2(bb.Max.x, line_y), GetColorU32(line_colf)); // FIXME-TEXT: Underline mode.
1482
+ window->DrawList->AddLine(ImVec2(bb.Min.x, line_y), ImVec2(bb.Max.x, line_y), GetColorU32(line_colf)); // FIXME-TEXT: Underline mode // FIXME-DPI
1482
1483
1483
1484
PushStyleColor(ImGuiCol_Text, GetColorU32(text_colf));
1484
1485
RenderText(bb.Min, label, label_end);
@@ -5339,7 +5340,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
5339
5340
ImVec2 cursor_screen_pos = ImTrunc(draw_pos + cursor_offset - draw_scroll);
5340
5341
ImRect cursor_screen_rect(cursor_screen_pos.x, cursor_screen_pos.y - g.FontSize + 0.5f, cursor_screen_pos.x + 1.0f, cursor_screen_pos.y - 1.5f);
5341
5342
if (cursor_is_visible && cursor_screen_rect.Overlaps(clip_rect))
5342
- draw_window->DrawList->AddLine(cursor_screen_rect.Min, cursor_screen_rect.GetBL(), GetColorU32(ImGuiCol_Text));
5343
+ draw_window->DrawList->AddLine(cursor_screen_rect.Min, cursor_screen_rect.GetBL(), GetColorU32(ImGuiCol_Text), 1.0f); // FIXME-DPI: Cursor thickness (#7031) + Color
5343
5344
5344
5345
// Notify OS of text input position for advanced IME (-1 x offset so that Windows IME can cover our cursor. Bit of an extra nicety.)
5345
5346
if (!is_readonly)
@@ -6207,7 +6208,7 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl
6207
6208
if (g.Style.FrameBorderSize > 0.0f)
6208
6209
RenderFrameBorder(bb.Min, bb.Max, rounding);
6209
6210
else
6210
- window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), rounding); // Color buttons are often in need of some sort of border
6211
+ window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), rounding); // Color buttons are often in need of some sort of border // FIXME-DPI
6211
6212
}
6212
6213
6213
6214
// Drag and Drop Source
@@ -7486,7 +7487,7 @@ void ImGui::EndBoxSelect(const ImRect& scope_rect, ImGuiMultiSelectFlags ms_flag
7486
7487
ImRect box_select_r = bs->BoxSelectRectCurr;
7487
7488
box_select_r.ClipWith(scope_rect);
7488
7489
window->DrawList->AddRectFilled(box_select_r.Min, box_select_r.Max, GetColorU32(ImGuiCol_SeparatorHovered, 0.30f)); // FIXME-MULTISELECT: Styling
7489
- window->DrawList->AddRect(box_select_r.Min, box_select_r.Max, GetColorU32(ImGuiCol_NavCursor)); // FIXME-MULTISELECT: Styling
7490
+ window->DrawList->AddRect(box_select_r.Min, box_select_r.Max, GetColorU32(ImGuiCol_NavCursor)); // FIXME-MULTISELECT FIXME-DPI : Styling
7490
7491
7491
7492
// Scroll
7492
7493
const bool enable_scroll = (ms_flags & ImGuiMultiSelectFlags_ScopeWindow) && (ms_flags & ImGuiMultiSelectFlags_BoxSelectNoScroll) == 0;
0 commit comments