mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18601) -Codechange: Use resize step of the order list panel widget for order line calculations.

release/1.0
alberth 2009-12-22 11:22:07 +00:00
parent 4733b696a1
commit 96a8a0f34d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/order_gui.cpp
View File

@ -491,7 +491,8 @@ private:
*/ */
int GetOrderFromPt(int y) int GetOrderFromPt(int y)
{ {
int sel = (y - this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->pos_y - WD_FRAMERECT_TOP) / this->resize.step_height; // Selected line in the ORDER_WIDGET_ORDER_LIST panel. NWidgetBase *nwid = this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST);
int sel = (y - nwid->pos_y - WD_FRAMERECT_TOP) / nwid->resize_y; // Selected line in the ORDER_WIDGET_ORDER_LIST panel.
if ((uint)sel >= this->vscroll.GetCapacity()) return INVALID_ORDER; if ((uint)sel >= this->vscroll.GetCapacity()) return INVALID_ORDER;
@ -943,6 +944,7 @@ public:
int middle = rtl ? r.right - WD_FRAMETEXT_RIGHT - index_column_width : r.left + WD_FRAMETEXT_LEFT + index_column_width; int middle = rtl ? r.right - WD_FRAMETEXT_RIGHT - index_column_width : r.left + WD_FRAMETEXT_LEFT + index_column_width;
int y = r.top + WD_FRAMERECT_TOP; int y = r.top + WD_FRAMERECT_TOP;
int line_height = this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->resize_y;
int i = this->vscroll.GetPosition(); int i = this->vscroll.GetPosition();
const Order *order = this->vehicle->GetOrder(i); const Order *order = this->vehicle->GetOrder(i);
@ -952,7 +954,7 @@ public:
if (!this->vscroll.IsVisible(i)) break; if (!this->vscroll.IsVisible(i)) break;
DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, r.left + WD_FRAMETEXT_LEFT, middle, r.right - WD_FRAMETEXT_RIGHT); DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, r.left + WD_FRAMETEXT_LEFT, middle, r.right - WD_FRAMETEXT_RIGHT);
y += this->resize.step_height; y += line_height;
i++; i++;
order = order->next; order = order->next;