From f6f635a5839a15054f3c812ea4ea37566a0bf426 Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Tue, 13 May 2014 21:14:21 -0700 Subject: [PATCH] Midstream on #8 : Reverted to using ImageDisplay and cut out the properties change event handler, to show how it looks before getting horked up --- lib/tailor/GUI/TilesetEditor.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/tailor/GUI/TilesetEditor.rb b/lib/tailor/GUI/TilesetEditor.rb index 69b38b2..74e8909 100644 --- a/lib/tailor/GUI/TilesetEditor.rb +++ b/lib/tailor/GUI/TilesetEditor.rb @@ -18,7 +18,8 @@ module Tailor tmpversizer = Wx::BoxSizer.new(Wx::VERTICAL) @tilesetProperties = Tailor::GUI::TilesetProperties.new(@panel, Wx::ID_ANY) - evt_tileprops_changed(@tilesetProperties) { |event| on_tilepropsChanged(event) } + #evt_tileprops_changed(@tilesetProperties) { |event| on_tilepropsChanged(event) } + tmpversizer.add(@tilesetProperties, 0, flag = Wx::EXPAND|Wx::ALL) @cancelBtn = Wx::Button.new(@panel, Wx::ID_ANY, "Cancel") evt_button(@cancelBtn.get_id()) { |event| on_CancelClicked(event) } @@ -41,7 +42,8 @@ module Tailor tmpversizer.add(@cancelBtn, 0, flag=Wx::EXPAND) rowsizer.add(tmpversizer, 0, flag = Wx::EXPAND|Wx::ALL) - @tilesetSlicer = Tailor::GUI::GridDisplay.new(@panel, Wx::ID_ANY) + #@tilesetSlicer = Tailor::GUI::GridDisplay.new(@panel, Wx::ID_ANY) + @tilesetSlicer = Tailor::GUI::ImageDisplay.new(@panel, Wx::ID_ANY) @tilesetSlicer.set_min_size(Wx::Size.new(320, 240)) rowsizer.add(@tilesetSlicer, 1, flag = Wx::EXPAND|Wx::ALL)