dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().

Browse Source
This commit is contained in:
frosch
2010-01-30 18:34:48 +00:00
parent 2f6fe85f23
commit 88019e64e1
46 changed files with 190 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/network_content_gui.cpp
View File

@@ -164,7 +164,7 @@ public:
DrawStringMultiLine(r.left + 2, r.right - 2, y, y + FONT_HEIGHT_NORMAL * 2, str, TC_FROMSTRING, SA_CENTER);
}
virtual void OnClick(Point pt, int widget)
virtual void OnClick(Point pt, int widget, int click_count)
{
if (widget == NCDSWW_CANCELOK) {
if (this->downloaded_bytes != this->total_bytes) _network_content_client.Close();
@@ -583,16 +583,7 @@ public:
}
}
virtual void OnDoubleClick(Point pt, int widget)
{
/* Double clicking on a line in the matrix toggles the state of the checkbox */
if (widget != NCLWW_MATRIX) return;
pt.x = this->GetWidget<NWidgetBase>(NCLWW_CHECKBOX)->pos_x;
this->OnClick(pt, widget);
}
virtual void OnClick(Point pt, int widget)
virtual void OnClick(Point pt, int widget, int click_count)
{
switch (widget) {
case NCLWW_MATRIX: {
@@ -607,7 +598,7 @@ public:
this->list_pos = id_v;
const NWidgetBase *checkbox = this->GetWidget<NWidgetBase>(NCLWW_CHECKBOX);
if (IsInsideBS(pt.x, checkbox->pos_x, checkbox->current_x)) {
if (click_count > 1 || IsInsideBS(pt.x, checkbox->pos_x, checkbox->current_x)) {
_network_content_client.ToggleSelectedState(this->selected);
this->content.ForceResort();
}