Mercurial > hg > openttd

changeset 13059:da49b7fa34f7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17557) -Codechange: Pass left and right edge to DrawOrderString().
author alberth <alberth@openttd.org>
date Wed, 16 Sep 2009 19:00:53 +0000
parents 4ba63ee1f46f
children 0ea9c5ed1b7a
files src/order_func.h src/order_gui.cpp src/timetable_gui.cpp
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/order_func.h
+++ b/src/order_func.h
@@ -47,7 +47,7 @@
 bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0);
 VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v);
 
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width);
+void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int right);
 
 #define MIN_SERVINT_PERCENT  5
 #define MAX_SERVINT_PERCENT 90
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -183,7 +183,7 @@
 	}
 }
 
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width)
+void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int right)
 {
 	StringID str = (v->cur_order_index == order_index) ? STR_ORDER_SELECTED : STR_ORDER;
 	SetDParam(6, STR_EMPTY);
@@ -287,7 +287,7 @@
 	}
 
 	SetDParam(0, order_index + 1);
-	DrawString(2, width + 2, y, str, selected ? TC_WHITE : TC_BLACK);
+	DrawString(left, right, y, str, selected ? TC_WHITE : TC_BLACK);
 }
 
 
@@ -842,7 +842,7 @@
 			/* Don't draw anything if it extends past the end of the window. */
 			if (!this->vscroll.IsVisible(i)) break;
 
-			DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, this->widget[ORDER_WIDGET_ORDER_LIST].right - 4);
+			DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, this->widget[ORDER_WIDGET_ORDER_LIST].left + 2, this->widget[ORDER_WIDGET_ORDER_LIST].right - 2);
 			y += ORDER_LIST_LINE_HEIGHT;
 
 			i++;
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -190,7 +190,7 @@
 			if (!this->vscroll.IsVisible(i)) break;
 
 			if (i % 2 == 0) {
-				DrawOrderString(v, order, order_id, y, i == selected, true, this->widget[TTV_TIMETABLE_PANEL].right - 4);
+				DrawOrderString(v, order, order_id, y, i == selected, true, this->widget[TTV_TIMETABLE_PANEL].left + 2, this->widget[TTV_TIMETABLE_PANEL].right - 2);
 
 				order_id++;