cpp/openttd-patchpack/source Changeset - r13626:6736aab66c51

Changeset - r13626:6736aab66c51

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

peter1138 - 15 years ago 2009-11-18 10:09:22
peter1138@openttd.org

(svn r18160) -Codechange: The hyphen character may not line up in all fonts, so draw
the Y-axis ticks manually.

2 files changed with 4 insertions and 3 deletions:

src/graph_gui.cpp

src/lang/english.txt

0 comments (0 inline, 0 general)

src/graph_gui.cpp

➞

Show inline comments

@@ @@ -267,13 +267,13 @@ protected: @@
 		byte grid_colour = _colour_gradient[COLOUR_GREY][4];
 		/* Rect r will be adjusted to contain just the graph, with labels being
 		 * placed outside the area. */
 		r.top    += 5 + GetCharacterHeight(FS_SMALL) / 2;
 		r.bottom -= (this->month == 0xFF ? 1 : 3) * GetCharacterHeight(FS_SMALL) + 4;
-		r.left   += 5;
+		r.left   += 9;
 		r.right  -= 5;
 		/* Start of with a highest_value of twice the height of the graph in pixels.
 		 * It's a bit arbitrary, but it makes the cargo payment graph look a little
 		 * nicer, and prevents division by zero when calculating where the datapoint
 		 * should be drawn. */
@@ @@ -309,12 +309,13 @@ protected: @@
+		}
 		/* Draw the horizontal grid lines. */
 		y = r.bottom;
 		for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) {
 			GfxFillRect(r.left - 3, y, r.left - 1, y, GRAPH_AXIS_LINE_COLOUR);
 			GfxFillRect(r.left, y, r.right, y, grid_colour);
 			y -= y_sep;
+		}
 		/* Draw the y axis. */
 		GfxFillRect(r.left, r.top, r.left, r.bottom, GRAPH_AXIS_LINE_COLOUR);
@@ @@ -340,13 +341,13 @@ protected: @@
 		y = r.top - GetCharacterHeight(FS_SMALL) / 2;
 		for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) {
 			SetDParam(0, this->format_str_y_axis);
 			SetDParam(1, y_label);
 			DrawString(r.left - label_width, r.left, y, STR_GRAPH_Y_LABEL, graph_axis_label_colour, SA_RIGHT);
+			DrawString(r.left - label_width - 4, r.left - 4, y, STR_GRAPH_Y_LABEL, graph_axis_label_colour, SA_RIGHT);
 			y_label -= y_label_separation;
 			y += y_sep;
+		}
 		/* draw strings on the x axis */

src/lang/english.txt

➞

Show inline comments

@@ @@ -503,13 +503,13 @@ STR_MONTH_DEC @@
 # Graph window
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Key
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Show key to graphs
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
-STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING2}-
 STR_GRAPH_Y_LABEL                                               :{TINYFONT}{STRING2}
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINYFONT}{COMMA}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Operating Profit Graph
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Income Graph
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Units of cargo delivered
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Company performance ratings (maximum rating=1000)

0 comments (0 inline, 0 general)