cpp/openttd-patchpack/source Changeset - r24026:3889ae29a02d

Changeset - r24026:3889ae29a02d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Niels Martin Hansen - 4 years ago 2020-01-04 22:06:49
nielsm@indvikleren.dk

Add: Highlight item under mouse in file browser

2 files changed with 31 insertions and 0 deletions:

src/fios_gui.cpp

src/gfx_func.h

0 comments (0 inline, 0 general)

src/fios_gui.cpp

➞

Show inline comments

@@ @@ -271,6 +271,7 @@ private: @@
 	FileList fios_items;          ///< Save game list.
 	FiosItem o_dir;               ///< Original dir (home dir for this browser)
 	const FiosItem *selected;     ///< Selected game in #fios_items, or \c nullptr.
 	const FiosItem *highlighted;  ///< Item in fios_items highlighted by mouse pointer, or \c nullptr.
 	Scrollbar *vscroll;
 	StringFilter string_filter; ///< Filter for available games.
@@ @@ -445,6 +446,8 @@ public: @@
 					if (item == this->selected) {
 						GfxFillRect(r.left + 1, y, r.right, y + this->resize.step_height, PC_DARK_BLUE);
 					} else if (item == this->highlighted) {
 						GfxFillRect(r.left + 1, y, r.right, y + this->resize.step_height, PC_VERY_DARK_BLUE);
+					}
 					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, item->title, _fios_colours[GetDetailedFileType(item->type)]);
 					y += this->resize.step_height;
@@ @@ -714,6 +717,33 @@ public: @@
+		}
+	}
 	void OnMouseLoop() override
+	{
 		const Point pt{ _cursor.pos.x - this->left, _cursor.pos.y - this->top };
 		const int widget = GetWidgetFromPos(this, pt.x, pt.y);
 		if (widget == WID_SL_DRIVES_DIRECTORIES_LIST) {
 			int y = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_SL_DRIVES_DIRECTORIES_LIST, WD_FRAMERECT_TOP);
 			if (y == INT_MAX) return;
 			/* Get the corresponding non-filtered out item from the list */
 			int i = 0;
 			while (i <= y) {
 				if (!this->fios_items_shown[i]) y++;
 				i++;
+			}
 			const FiosItem *file = this->fios_items.Get(y);
 			if (file != this->highlighted) {
 				this->highlighted = file;
 				this->SetWidgetDirty(WID_SL_DRIVES_DIRECTORIES_LIST);
+			}
 		} else if (this->highlighted != nullptr) {
 			this->highlighted = nullptr;
 			this->SetWidgetDirty(WID_SL_DRIVES_DIRECTORIES_LIST);
+		}
+	}
 	EventState OnKeyPress(WChar key, uint16 keycode) override
+	{
 		if (keycode == WKC_ESC) {

src/gfx_func.h

➞

Show inline comments

@@ @@ -219,6 +219,7 @@ static const uint8 PC_VERY_LIGHT_YELLOW @@
 static const uint8 PC_GREEN              = 0xD0;           ///< Green palette colour.
 static const uint8 PC_VERY_DARK_BLUE     = 0x9A;           ///< Almost-black blue palette colour.
 static const uint8 PC_DARK_BLUE          = 0x9D;           ///< Dark blue palette colour.
 static const uint8 PC_LIGHT_BLUE         = 0x98;           ///< Light blue palette colour.

0 comments (0 inline, 0 general)