upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 18:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Load Map dialog in the editor

Browse Source
This commit is contained in:
Tommy 2022-07-14 19:16:39 +12:00
parent bd05566de0
commit 29204418db
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/widgets/listbox.cpp
View File

@ -53,7 +53,6 @@ listbox::listbox(const implementation::builder_styled_widget& builder,
, generator_(nullptr)
, is_horizontal_(placement == generator_base::horizontal_list)
, list_builder_(list_builder)
, need_layout_(false)
, orders_()
, callback_order_change_()
{
@ -394,9 +393,7 @@ void listbox::resize_content(const int width_modification,
// Set new size.
content_grid()->set_size(size);
// Set status.
need_layout_ = true;
update_layout();
// If the content grows assume it "overwrites" the old content.
if(width_modification < 0 || height_modification < 0) {
@ -430,11 +427,6 @@ void listbox::resize_content(const widget& row)
resize_content(size.x, size.y);
}
void listbox::layout_children()
{
layout_children(false);
}
point listbox::calculate_best_size() const
{
// Get the size from the base class, then add any extra space for the header and footer.
@ -608,8 +600,7 @@ void listbox::order_by(const generator_base::order_func& func)
{
generator_->set_order(func);
queue_redraw();
need_layout_ = true;
update_layout();
}
void listbox::set_column_order(unsigned col, const generator_sort_array& func)
@ -682,20 +673,16 @@ void listbox::set_content_size(const point& origin, const point& size)
content_grid()->place(origin, s);
}
void listbox::layout_children(const bool force)
void listbox::update_layout()
{
assert(content_grid());
if(need_layout_ || force) {
content_grid()->place(content_grid()->get_origin(), content_grid()->get_size());
content_grid()->place(content_grid()->get_origin(), content_grid()->get_size());
const SDL_Rect& visible = content_visible_area_;
const SDL_Rect& visible = content_visible_area_;
content_grid()->set_visible_rectangle(visible);
content_grid()->set_visible_rectangle(visible);
need_layout_ = false;
queue_redraw();
}
queue_redraw();
}
// }---------- DEFINITION ---------{

9
src/gui/widgets/listbox.hpp
View File

@ -253,9 +253,6 @@ public:
/** See @ref widget::place. */
virtual void place(const point& origin, const point& size) override;
/** See @ref widget::layout_children. */
virtual void layout_children() override;
/***** ***** ***** setters / getters for members ***** ****** *****/
void order_by(const generator_base::order_func& func);
@ -366,8 +363,6 @@ private:
/** Contains the builder for the new items. */
builder_grid_const_ptr list_builder_;
bool need_layout_;
typedef std::vector<std::pair<selectable_item*, generator_sort_array>> torder_list;
torder_list orders_;
@ -404,8 +399,8 @@ private:
*/
void resize_content(const widget& row);
/** Layouts the children if needed. */
void layout_children(const bool force);
/** Updates internal layout. */
void update_layout();
/** Inherited from scrollbar_container. */
virtual void set_content_size(const point& origin, const point& size) override;