andrew/tailor
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Midstream on #8 : Reverted to using ImageDisplay and cut out the properties change event handler, to show how it looks before getting horked up

Browse Source
This commit is contained in:
Andrew Kesterson
2014-05-13 21:14:21 -07:00
parent 1b708359a6
commit f6f635a583
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tailor/GUI/TilesetEditor.rb
View File

@@ -18,7 +18,8 @@ module Tailor
tmpversizer = Wx::BoxSizer.new(Wx::VERTICAL) tmpversizer = Wx::BoxSizer.new(Wx::VERTICAL)
@tilesetProperties = Tailor::GUI::TilesetProperties.new(@panel, Wx::ID_ANY) @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) tmpversizer.add(@tilesetProperties, 0, flag = Wx::EXPAND|Wx::ALL)
@cancelBtn = Wx::Button.new(@panel, Wx::ID_ANY, "Cancel") @cancelBtn = Wx::Button.new(@panel, Wx::ID_ANY, "Cancel")
evt_button(@cancelBtn.get_id()) { |event| on_CancelClicked(event) } evt_button(@cancelBtn.get_id()) { |event| on_CancelClicked(event) }
@@ -41,7 +42,8 @@ module Tailor
tmpversizer.add(@cancelBtn, 0, flag=Wx::EXPAND) tmpversizer.add(@cancelBtn, 0, flag=Wx::EXPAND)
rowsizer.add(tmpversizer, 0, flag = Wx::EXPAND|Wx::ALL) 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)) @tilesetSlicer.set_min_size(Wx::Size.new(320, 240))
rowsizer.add(@tilesetSlicer, 1, flag = Wx::EXPAND|Wx::ALL) rowsizer.add(@tilesetSlicer, 1, flag = Wx::EXPAND|Wx::ALL)