diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-13 15:56:27 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-13 15:56:27 +0800 |
| commit | 1445b6806b8a359594b1789726aa87d64b279286 (patch) | |
| tree | 26928a4ed18cfcc7b434a17bff7d7488aa8b32ef /scene/gui | |
| parent | c0d363266755de3ac87f61600f23921d881d99e2 (diff) | |
| parent | 30d36581100f0bf71c6d2502be9a03443bdf8708 (diff) | |
Merge branch 'master' into x11-window-management
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/grid_container.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index f54345cdb8..582693eb3a 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -226,5 +226,6 @@ Size2 GridContainer::get_minimum_size() const { GridContainer::GridContainer() { + set_stop_mouse(false); columns=1; } |