Grid Hi-DPI

Author: 0tkl

src/base_grid.cpp

@@ -181,7 +181,7 @@ void BaseGrid::UpdateStyle() {
 	dc.SetFont(font);
 
 	// Set line height
-	lineHeight = dc.GetCharHeight() + 4;
+	lineHeight = dc.GetCharHeight() + FromDIP(4);
 
 	// Set row brushes
 	row_colors.Default.SetColour(to_wx(OPT_GET("Colour/Subtitle Grid/Background/Background")->GetColor()));
@@ -319,13 +319,13 @@ void BaseGrid::OnPaint(wxPaintEvent &) {
 	dc.SetPen(*wxTRANSPARENT_PEN);
 
 	auto paint_text = [&](wxString const& str, int x, int y, int col) {
-		int left = x + 4;
+		int left = x + FromDIP(4);
 		if (columns[col]->Centered()) {
 			wxSize ext = dc.GetTextExtent(str);
-			left += (columns[col]->Width() - 6 - ext.GetWidth()) / 2;
+			left += (columns[col]->Width() - FromDIP(6) - ext.GetWidth()) / 2;
 		}
 
-		dc.DrawText(str, left, y + 2);
+		dc.DrawText(str, left, y + FromDIP(2));
 	};
 
 	// Paint header

src/grid_column.cpp

@@ -90,8 +90,8 @@ void GridColumn::UpdateWidth(const agi::Context *c, WidthHelper &helper) {
 void GridColumn::Paint(wxDC &dc, int x, int y, const AssDialogue *d, const agi::Context *c) const {
 	wxString str = Value(d, c);
 	if (Centered())
-		x += (width - 6 - dc.GetTextExtent(str).GetWidth()) / 2;
-	dc.DrawText(str, x + 4, y + 2);
+		x += (width - dc.FromDIP(6) - dc.GetTextExtent(str).GetWidth()) / 2;
+	dc.DrawText(str, x + dc.FromDIP(4), y + dc.FromDIP(2));
 }
 
 namespace {
@@ -335,12 +335,12 @@ class GridColumnCPS final : public GridColumn {
 			double alpha = std::min((double)(cps - cps_min + 1) / (cps_max - cps_min + 1), 1.0);
 			dc.SetBrush(wxBrush(blend(to_wx(bg_color->GetColor()), dc.GetBrush().GetColour(), alpha)));
 			dc.SetPen(*wxTRANSPARENT_PEN);
-			dc.DrawRectangle(x, y + 1, width, ext.GetHeight() + 3);
+			dc.DrawRectangle(x, y + 1, width, ext.GetHeight() + dc.FromDIP(4) - 1);
 			dc.SetTextForeground(blend(*wxBLACK, tc, alpha));
 		}
 
-		x += (width + 2 - ext.GetWidth()) / 2;
-		dc.DrawText(str, x, y + 2);
+		x += (width + dc.FromDIP(2) - ext.GetWidth()) / 2;
+		dc.DrawText(str, x, y + dc.FromDIP(2));
 		dc.SetTextForeground(tc);
 	}
 };