From 98d3d86004520bfb32e8e4d90c9f0c5210828deb Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 6 Aug 2008 07:10:40 +0000 Subject: (svn r14004) -Codechange: Clean of drop down lists. Move empty item drawing to base ListItem Draw() function. Remove String() from base class. Pass correct width to Draw(). --- src/widgets/dropdown_type.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/widgets/dropdown_type.h') diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 3cdb48f87..aa4baafe1 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -19,9 +19,10 @@ public: DropDownListItem(int result, bool masked) : result(result), masked(masked) {} virtual ~DropDownListItem() {} - virtual StringID String() const; - virtual uint Height(uint width) const; - virtual void Draw(int x, int y, uint width, uint height, bool sel) const; + + virtual bool Selectable() const { return false; } + virtual uint Height(uint width) const { return 10; } + virtual void Draw(int x, int y, uint width, uint height, bool sel, int bg_colour) const; }; /** @@ -34,7 +35,9 @@ public: DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(string) {} virtual ~DropDownListStringItem() {} - StringID String() const; + virtual bool Selectable() const { return true; } + virtual void Draw(int x, int y, uint width, uint height, bool sel, int bg_colour) const; + virtual StringID String() const { return this->string; } }; /** @@ -47,8 +50,8 @@ public: DropDownListParamStringItem(StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked) {} virtual ~DropDownListParamStringItem() {} - StringID String() const; - void SetParam(uint index, uint64 value) { decode_params[index] = value; } + virtual StringID String() const; + virtual void SetParam(uint index, uint64 value) { decode_params[index] = value; } }; /** -- cgit v1.2.3-54-g00ecf