Mercurial > hg > openttd
changeset 14058:e72e69fcf01b draft
(svn r18601) -Codechange: Use resize step of the order list panel widget for order line calculations.
| author | alberth <alberth@openttd.org> |
|---|---|
| date | Tue, 22 Dec 2009 11:22:07 +0000 |
| parents | 1422b26b44ac |
| children | 76db067696bb |
| files | src/order_gui.cpp |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -491,7 +491,8 @@ */ 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; @@ -943,6 +944,7 @@ 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 line_height = this->GetWidget<NWidgetBase>(ORDER_WIDGET_ORDER_LIST)->resize_y; int i = this->vscroll.GetPosition(); const Order *order = this->vehicle->GetOrder(i); @@ -952,7 +954,7 @@ 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); - y += this->resize.step_height; + y += line_height; i++; order = order->next;