Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup: More documentation fixes #8208

Merged
merged 2 commits into from Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 18 additions & 9 deletions src/gfx.cpp
Expand Up @@ -1416,6 +1416,16 @@ void DrawMouseCursor()
_cursor.dirty = false;
}

/**
* Repaints a specific rectangle of the screen.
*
* @param left,top,right,bottom The area of the screen that needs repainting
* @pre The rectangle should have been previously marked dirty with \c AddDirtyBlock.
* @see AddDirtyBlock
* @see DrawDirtyBlocks
* @ingroup dirty
*
*/
void RedrawScreenRect(int left, int top, int right, int bottom)
{
assert(right <= _screen.width && bottom <= _screen.height);
Expand All @@ -1438,7 +1448,9 @@ void RedrawScreenRect(int left, int top, int right, int bottom)
/**
* Repaints the rectangle blocks which are marked as 'dirty'.
*
* @see SetDirtyBlocks
* @see AddDirtyBlock
*
* @ingroup dirty
*/
void DrawDirtyBlocks()
{
Expand Down Expand Up @@ -1541,21 +1553,18 @@ void DrawDirtyBlocks()
}

/**
* This function extends the internal _invalid_rect rectangle as it
* now contains the rectangle defined by the given parameters. Note
* the point (0,0) is top left.
* Extend the internal _invalid_rect rectangle to contain the rectangle
* defined by the given parameters. Note the point (0,0) is top left.
*
* @param left The left edge of the rectangle
* @param top The top edge of the rectangle
* @param right The right edge of the rectangle
* @param bottom The bottom edge of the rectangle
* @see DrawDirtyBlocks
* @ingroup dirty
*
* @todo The name of the function should be called like @c AddDirtyBlock as
* it neither set a dirty rect nor add several dirty rects although
* the function name is in plural. (Progman)
*/
void SetDirtyBlocks(int left, int top, int right, int bottom)
void AddDirtyBlock(int left, int top, int right, int bottom)
{
byte *b;
int width;
Expand Down Expand Up @@ -1600,7 +1609,7 @@ void SetDirtyBlocks(int left, int top, int right, int bottom)
*/
void MarkWholeScreenDirty()
{
SetDirtyBlocks(0, 0, _screen.width, _screen.height);
AddDirtyBlock(0, 0, _screen.width, _screen.height);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/gfx_func.h
Expand Up @@ -131,7 +131,7 @@ Point GetCharPosInString(const char *str, const char *ch, FontSize start_fontsiz
const char *GetCharAtPosition(const char *str, int x, FontSize start_fontsize = FS_NORMAL);

void DrawDirtyBlocks();
void SetDirtyBlocks(int left, int top, int right, int bottom);
void AddDirtyBlock(int left, int top, int right, int bottom);
void MarkWholeScreenDirty();

void GfxInitPalettes();
Expand Down
2 changes: 1 addition & 1 deletion src/news_gui.cpp
Expand Up @@ -571,7 +571,7 @@ struct NewsWindow : Window {
if (this->viewport != nullptr) this->viewport->top += newtop - this->top;
this->top = newtop;

SetDirtyBlocks(this->left, mintop, this->left + this->width, maxtop + this->height);
AddDirtyBlock(this->left, mintop, this->left + this->width, maxtop + this->height);
}

StringID GetCompanyMessageString() const
Expand Down
2 changes: 1 addition & 1 deletion src/viewport.cpp
Expand Up @@ -1886,7 +1886,7 @@ static void MarkViewportDirty(const ViewPort *vp, int left, int top, int right,

if (top >= vp->virtual_height) return;

SetDirtyBlocks(
AddDirtyBlock(
UnScaleByZoomLower(left, vp->zoom) + vp->left,
UnScaleByZoomLower(top, vp->zoom) + vp->top,
UnScaleByZoom(right, vp->zoom) + vp->left + 1,
Expand Down
2 changes: 1 addition & 1 deletion src/widget.cpp
Expand Up @@ -774,7 +774,7 @@ void NWidgetBase::SetDirty(const Window *w) const
{
int abs_left = w->left + this->pos_x;
int abs_top = w->top + this->pos_y;
SetDirtyBlocks(abs_left, abs_top, abs_left + this->current_x, abs_top + this->current_y);
AddDirtyBlock(abs_left, abs_top, abs_left + this->current_x, abs_top + this->current_y);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/window.cpp
Expand Up @@ -655,7 +655,7 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, int click_count)
WidgetType widget_type = (nw != nullptr) ? nw->type : WWT_EMPTY;

bool focused_widget_changed = false;
/* If clicked on a window that previously did dot have focus */
/* If clicked on a window that previously did not have focus */
if (_focused_window != w && // We already have focus, right?
(w->window_desc->flags & WDF_NO_FOCUS) == 0 && // Don't lose focus to toolbars
widget_type != WWT_CLOSEBOX) { // Don't change focused window if 'X' (close button) was clicked
Expand Down Expand Up @@ -983,7 +983,7 @@ void DrawOverlappedWindowForAll(int left, int top, int right, int bottom)
*/
void Window::SetDirty() const
{
SetDirtyBlocks(this->left, this->top, this->left + this->width, this->top + this->height);
AddDirtyBlock(this->left, this->top, this->left + this->width, this->top + this->height);
}

/**
Expand Down Expand Up @@ -3493,7 +3493,7 @@ static int PositionWindow(Window *w, WindowClass clss, int setting)
default: w->left = 0; break;
}
if (w->viewport != nullptr) w->viewport->left += w->left - old_left;
SetDirtyBlocks(0, w->top, _screen.width, w->top + w->height); // invalidate the whole row
AddDirtyBlock(0, w->top, _screen.width, w->top + w->height); // invalidate the whole row
return w->left;
}

Expand Down