miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed timetable window

Browse Source
This commit is contained in:
pelya
2017-03-23 23:38:35 +02:00
parent 0ed45f178a
commit 39bb32ee90
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/timetable_gui.cpp
View File

@@ -200,8 +200,8 @@ struct TimetableWindow : Window {
/* FALL THROUGH */
case WID_VT_ARRIVAL_DEPARTURE_SELECTION:
case WID_VT_TIMETABLE_PANEL:
resize->height = FONT_HEIGHT_NORMAL;
size->height = WD_FRAMERECT_TOP + 8 * resize->height + WD_FRAMERECT_BOTTOM;
resize->height = GetMinSizing(NWST_STEP, FONT_HEIGHT_NORMAL);
size->height = WD_FRAMERECT_TOP + 4 * resize->height + WD_FRAMERECT_BOTTOM;
break;
case WID_VT_SUMMARY_PANEL:
@@ -212,7 +212,8 @@ struct TimetableWindow : Window {
int GetOrderFromTimetableWndPt(int y, const Vehicle *v)
{
int sel = (y - this->GetWidget<NWidgetBase>(WID_VT_TIMETABLE_PANEL)->pos_y - WD_FRAMERECT_TOP) / FONT_HEIGHT_NORMAL;
int line_height = this->GetWidget<NWidgetBase>(WID_VT_TIMETABLE_PANEL)->resize_y;
int sel = (y - this->GetWidget<NWidgetBase>(WID_VT_TIMETABLE_PANEL)->pos_y - WD_FRAMERECT_TOP) / line_height;
if ((uint)sel >= this->vscroll->GetCapacity()) return INVALID_ORDER;
@@ -355,7 +356,8 @@ struct TimetableWindow : Window {
switch (widget) {
case WID_VT_TIMETABLE_PANEL: {
int y = r.top + WD_FRAMERECT_TOP;
int line_height = this->GetWidget<NWidgetBase>(WID_VT_TIMETABLE_PANEL)->resize_y;
int y = Center(r.top + WD_FRAMERECT_TOP, line_height);
int i = this->vscroll->GetPosition();
VehicleOrderID order_id = (i + 1) / 2;
bool final_order = false;
@@ -413,7 +415,7 @@ struct TimetableWindow : Window {
}
i++;
y += FONT_HEIGHT_NORMAL;
y += line_height;
}
break;
}
@@ -431,7 +433,8 @@ struct TimetableWindow : Window {
VehicleOrderID earlyID = BuildArrivalDepartureList(v, arr_dep) ? cur_order : (VehicleOrderID)INVALID_VEH_ORDER_ID;
int y = r.top + WD_FRAMERECT_TOP;
int line_height = this->GetWidget<NWidgetBase>(WID_VT_TIMETABLE_PANEL)->resize_y;
int y = Center(r.top + WD_FRAMERECT_TOP, line_height);
bool show_late = this->show_expected && v->lateness_counter > DAY_TICKS;
Ticks offset = show_late ? 0 : -v->lateness_counter;
@@ -466,7 +469,7 @@ struct TimetableWindow : Window {
show_late ? TC_RED : i == selected ? TC_WHITE : TC_BLACK);
}
}
y += FONT_HEIGHT_NORMAL;
y += line_height;
}
break;
}

2
todo.txt
View File

@@ -16,5 +16,3 @@
- Tooltip window steals touches, move tooltip window back to the top of the mouse cursor.
- Move windows by dragging past window edge, close windows by moving them to toolbar.
- Timetable window is not finger-friendly.