Changeset - r15204:44488e441068
[Not reviewed]
master
0 2 0
alberth - 14 years ago 2010-05-16 19:13:31
alberth@openttd.org
(svn r19843) -Codechange: Move ComputeMaxSize() to widget_type.h to make it globally accessible.
2 files changed with 16 insertions and 16 deletions:
0 comments (0 inline, 0 general)
src/widget.cpp
Show inline comments
 
@@ -942,22 +942,6 @@ void NWidgetContainer::FillNestedArray(N
 
}
 

	
 
/**
 
 * Return the biggest possible size of a nested widget.
 
 * @param base      Base size of the widget.
 
 * @param max_space Available space for the widget.
 
 * @param step      Stepsize of the widget.
 
 * @return Biggest possible size of the widget, assuming that \a base may only be incremented by \a step size steps.
 
 */
 
static inline uint ComputeMaxSize(uint base, uint max_space, uint step)
 
{
 
	if (base >= max_space || step == 0) return base;
 
	if (step == 1) return max_space;
 
	int increment = max_space - base;
 
	increment -= increment % step;
 
	return base + increment;
 
}
 

	
 
/**
 
 * Widgets stacked on top of each other.
 
 */
 
NWidgetStacked::NWidgetStacked() : NWidgetContainer(NWID_SELECTION)
src/widget_type.h
Show inline comments
 
@@ -486,6 +486,22 @@ private:
 
};
 

	
 
/**
 
 * Return the biggest possible size of a nested widget.
 
 * @param base      Base size of the widget.
 
 * @param max_space Available space for the widget.
 
 * @param step      Stepsize of the widget.
 
 * @return Biggest possible size of the widget, assuming that \a base may only be incremented by \a step size steps.
 
 */
 
static FORCEINLINE uint ComputeMaxSize(uint base, uint max_space, uint step)
 
{
 
	if (base >= max_space || step == 0) return base;
 
	if (step == 1) return max_space;
 
	uint increment = max_space - base;
 
	increment -= increment % step;
 
	return base + increment;
 
}
 

	
 
/**
 
 * @defgroup NestedWidgetParts Hierarchical widget parts
 
 * To make nested widgets easier to enter, nested widget parts have been created. They allow the tree to be defined in a flat array of parts.
 
 *
0 comments (0 inline, 0 general)