Skip to content

Commit

Permalink
Add: Highlight item under mouse in file browser
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsmh committed Jan 4, 2020
1 parent 99d0cf8 commit 625bd7d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
30 changes: 30 additions & 0 deletions src/fios_gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ struct SaveLoadWindow : public Window {
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.
Expand Down Expand Up @@ -445,6 +446,8 @@ struct SaveLoadWindow : public Window {

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;
Expand Down Expand Up @@ -714,6 +717,33 @@ struct SaveLoadWindow : public Window {
}
}

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) {
Expand Down
1 change: 1 addition & 0 deletions src/gfx_func.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ static const uint8 PC_VERY_LIGHT_YELLOW = 0x45; ///< Almost-white yel

static const uint8 PC_GREEN = 0xD0; ///< Green palette colour.

static const uint8 PC_VERY_DARK_BLUE = 0x9A; ///< Almost-black dark 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.

Expand Down

0 comments on commit 625bd7d

Please sign in to comment.