Skip to content

M
magicseteditor
Commit a178b4ec authored by twanvl's avatar twanvl
Browse files
Options

tweak: slightly less dark lines in graph

parent b327868b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/gui/control/graph.cpp
View file @ a178b4ec
...@@ -860,7 +860,7 @@ void GraphLabelAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const { ...@@ -860,7 +860,7 @@ void GraphLabelAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const {
// Draw lines // Draw lines
if (draw_lines) { if (draw_lines) {
for (int i = 0 ; i < count ; ++i) { for (int i = 0 ; i < count ; ++i) {
dc.SetPen(i == current ? fg : lerp(bg, fg, 0.3)); dc.SetPen(i == current ? fg : lerp(bg, fg, 0.2));
if (draw_lines == DRAW_LINES_BETWEEN) { if (draw_lines == DRAW_LINES_BETWEEN) {
dc.DrawLine(RealPoint(rect.x + (i+1.0)*width, rect.top()), RealPoint(rect.x + (i+1.0)*width, rect.bottom())); dc.DrawLine(RealPoint(rect.x + (i+1.0)*width, rect.top()), RealPoint(rect.x + (i+1.0)*width, rect.bottom()));
} else { } else {
...@@ -886,7 +886,7 @@ void GraphLabelAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const { ...@@ -886,7 +886,7 @@ void GraphLabelAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const {
// Draw lines // Draw lines
if (draw_lines) { if (draw_lines) {
for (int i = 0 ; i < count ; ++i) { for (int i = 0 ; i < count ; ++i) {
dc.SetPen(i == current ? fg : lerp(bg, fg, 0.3)); dc.SetPen(i == current ? fg : lerp(bg, fg, 0.2));
if (draw_lines == DRAW_LINES_BETWEEN) { if (draw_lines == DRAW_LINES_BETWEEN) {
dc.DrawLine(RealPoint(rect.left(), rect.bottom() - (i+1.0)*height), RealPoint(rect.right(), rect.bottom() - (i+1.0)*height)); dc.DrawLine(RealPoint(rect.left(), rect.bottom() - (i+1.0)*height), RealPoint(rect.right(), rect.bottom() - (i+1.0)*height));
} else { } else {
...@@ -929,7 +929,7 @@ void GraphValueAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const { ...@@ -929,7 +929,7 @@ void GraphValueAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const {
Color bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); Color bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
Color fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); Color fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
// Draw backlines (horizontal) and value labels // Draw backlines (horizontal) and value labels
dc.SetPen(lerp(bg, fg, 0.3)); dc.SetPen(lerp(bg, fg, 0.2));
int highlight = (highlight_value && current >= 0) ? (int)axis.groups[current].size : -1; int highlight = (highlight_value && current >= 0) ? (int)axis.groups[current].size : -1;
for (int i = 0 ; i <= (int)axis.max ; ++i) { for (int i = 0 ; i <= (int)axis.max ; ++i) {
if (i % label_step == 0 || i == highlight) { if (i % label_step == 0 || i == highlight) {
...@@ -954,7 +954,7 @@ void GraphValueAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const { ...@@ -954,7 +954,7 @@ void GraphValueAxis::draw(RotatedDC& dc, int current, DrawLayer layer) const {
// restore font/pen // restore font/pen
if (i == highlight) { if (i == highlight) {
dc.SetFont(*wxNORMAL_FONT); dc.SetFont(*wxNORMAL_FONT);
dc.SetPen(lerp(bg, fg, 0.3)); dc.SetPen(lerp(bg, fg, 0.2));
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment