mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move internal Timeline structs from timeline.h to timeline.cpp

Browse Source
This commit is contained in:
David Capello 2017-04-12 15:53:54 -03:00
parent 097efa4cc2
commit fa49673c46
2 changed files with 66 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/app/ui/timeline/timeline.cpp
View File

@ -131,6 +131,65 @@ namespace {
} // anonymous namespace
Timeline::Hit::Hit(int part,
layer_t layer,
frame_t frame,
ObjectId frameTag,
int band)
: part(part),
layer(layer),
frame(frame),
frameTag(frameTag),
veryBottom(false),
band(band)
{
}
bool Timeline::Hit::operator!=(const Hit& other) const
{
return
part != other.part ||
layer != other.layer ||
frame != other.frame ||
frameTag != other.frameTag ||
band != other.band;
}
FrameTag* Timeline::Hit::getFrameTag() const
{
return get<FrameTag>(frameTag);
}
Timeline::DropTarget::DropTarget()
{
hhit = HNone;
vhit = VNone;
}
Timeline::LayerInfo::LayerInfo()
: layer(nullptr),
level(0),
inheritedFlags(LayerFlags::None)
{
}
Timeline::LayerInfo::LayerInfo(Layer* layer, int level, LayerFlags inheritedFlags)
: layer(layer),
level(level),
inheritedFlags(inheritedFlags)
{
}
bool Timeline::LayerInfo::parentVisible() const
{
return ((int(inheritedFlags) & int(LayerFlags::Visible)) != 0);
}
bool Timeline::LayerInfo::parentEditable() const
{
return ((int(inheritedFlags) & int(LayerFlags::Editable)) != 0);
}
Timeline::Timeline()
: Widget(kGenericWidget)
, m_hbar(HORIZONTAL, this)
@ -3399,11 +3458,6 @@ int Timeline::topHeight() const
return h;
}
FrameTag* Timeline::Hit::getFrameTag() const
{
return get<FrameTag>(frameTag);
}
void Timeline::onNewInputPriority(InputChainElement* element)
{
// It looks like the user wants to execute commands targetting the

49
src/app/ui/timeline/timeline.h
View File

@ -168,35 +168,17 @@ namespace app {
layer_t layer = -1,
frame_t frame = 0,
ObjectId frameTag = NullId,
int band = -1)
: part(part),
layer(layer),
frame(frame),
frameTag(frameTag),
veryBottom(false),
band(band) {
}
bool operator!=(const Hit& other) const {
return
part != other.part ||
layer != other.layer ||
frame != other.frame ||
frameTag != other.frameTag ||
band != other.band;
}
int band = -1);
bool operator!=(const Hit& other) const;
FrameTag* getFrameTag() const;
};
struct DropTarget {
enum HHit {
HNone,
Before,
After
};
enum VHit {
VNone,
Bottom,
@ -205,10 +187,7 @@ namespace app {
VeryBottom
};
DropTarget() {
hhit = HNone;
vhit = VNone;
}
DropTarget();
HHit hhit;
VHit vhit;
@ -223,25 +202,11 @@ namespace app {
int level;
LayerFlags inheritedFlags;
LayerInfo()
: layer(nullptr),
level(0),
inheritedFlags(LayerFlags::None) {
}
LayerInfo();
LayerInfo(Layer* layer, int level, LayerFlags inheritedFlags);
LayerInfo(Layer* layer, int level, LayerFlags inheritedFlags)
: layer(layer),
level(level),
inheritedFlags(inheritedFlags) {
}
bool parentVisible() const {
return ((int(inheritedFlags) & int(LayerFlags::Visible)) != 0);
}
bool parentEditable() const {
return ((int(inheritedFlags) & int(LayerFlags::Editable)) != 0);
}
bool parentVisible() const;
bool parentEditable() const;
};
bool selectedLayersBounds(const SelectedLayers& layers,