Merge pull request #5008 from pchote/spritewidget

Split ShpImageWidget into SpriteWidget and SpriteSequenceWidget.
This commit is contained in:
Matthias Mailänder
2014-04-02 09:56:06 +02:00
13 changed files with 288 additions and 190 deletions

View File

@@ -5,6 +5,7 @@ Container@ASSETBROWSER_PANEL:
Width:695
Height:435
Children:
LogicTicker@ANIMATION_TICKER:
ColorPreviewManager@COLOR_MANAGER:
Label@ASSETBROWSER_TITLE:
Width:PARENT_RIGHT
@@ -63,7 +64,6 @@ Container@ASSETBROWSER_PANEL:
Y:365
Width:160
Height:25
Text:mouse2.shp
Button@LOAD_BUTTON:
X:15
Y:395
@@ -104,10 +104,9 @@ Container@ASSETBROWSER_PANEL:
Height:325
Background:scrollpanel-bg
Children:
ShpImage@SPRITE:
Sprite@SPRITE:
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Image:mouse2
Container@FRAME_SELECTOR:
X:190
Y:395

View File

@@ -4,6 +4,7 @@ Background@COLOR_CHOOSER:
Width:234
Height:105
Children:
LogicTicker@ANIMATE_PREVIEW:
Background@HUEBG:
Background:panel-black
X:5
@@ -29,13 +30,14 @@ Background@COLOR_CHOOSER:
Y:2
Width:144
Height:72
ShpImage@FACT:
SpriteSequence@PREVIEW:
X:153
Y:1
Width:80
Height:73
Image:fact
Palette:colorpicker
Unit:fact
Sequence:idle
Button@RANDOM_BUTTON:
Key:tab
X:158