forked from mia/Aegisub
lol, grammar.
Originally committed to SVN as r1323.
This commit is contained in:
parent
af9af29419
commit
f963a8c462
4 changed files with 11 additions and 11 deletions
|
@ -210,7 +210,7 @@ aegisub_SOURCES = \
|
||||||
video_context.cpp \
|
video_context.cpp \
|
||||||
video_display.cpp \
|
video_display.cpp \
|
||||||
video_display_visual.cpp \
|
video_display_visual.cpp \
|
||||||
video_dragable_feature.cpp \
|
video_draggable_feature.cpp \
|
||||||
video_frame.cpp \
|
video_frame.cpp \
|
||||||
video_provider.cpp \
|
video_provider.cpp \
|
||||||
video_provider_dummy.cpp \
|
video_provider_dummy.cpp \
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
///////////
|
///////////
|
||||||
// Headers
|
// Headers
|
||||||
#include "gl_wrap.h"
|
#include "gl_wrap.h"
|
||||||
#include "video_dragable_feature.h"
|
#include "video_draggable_feature.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ private:
|
||||||
AssDialogue *curSelection;
|
AssDialogue *curSelection;
|
||||||
VideoDisplay *parent;
|
VideoDisplay *parent;
|
||||||
|
|
||||||
std::vector<VideoDragAbleFeature> drags;
|
std::vector<VideoDraggableFeature> drags;
|
||||||
|
|
||||||
void GetLinePosition(AssDialogue *diag,int &x,int &y);
|
void GetLinePosition(AssDialogue *diag,int &x,int &y);
|
||||||
void GetLinePosition(AssDialogue *diag,int &x,int &y,int &orgx,int &orgy);
|
void GetLinePosition(AssDialogue *diag,int &x,int &y,int &orgx,int &orgy);
|
||||||
|
|
|
@ -36,12 +36,12 @@
|
||||||
|
|
||||||
///////////
|
///////////
|
||||||
// Headers
|
// Headers
|
||||||
#include "video_dragable_feature.h"
|
#include "video_draggable_feature.h"
|
||||||
|
|
||||||
|
|
||||||
///////////////
|
///////////////
|
||||||
// Constructor
|
// Constructor
|
||||||
VideoDragAbleFeature::VideoDragAbleFeature() {
|
VideoDraggableFeature::VideoDraggableFeature() {
|
||||||
type = DRAG_NONE;
|
type = DRAG_NONE;
|
||||||
x = -1;
|
x = -1;
|
||||||
y = -1;
|
y = -1;
|
||||||
|
@ -51,12 +51,12 @@ VideoDragAbleFeature::VideoDragAbleFeature() {
|
||||||
|
|
||||||
/////////////////////
|
/////////////////////
|
||||||
// Is mouse over it?
|
// Is mouse over it?
|
||||||
bool VideoDragAbleFeature::IsMouseOver(int x,int y) {
|
bool VideoDraggableFeature::IsMouseOver(int x,int y) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
////////////////
|
////////////////
|
||||||
// Draw feature
|
// Draw feature
|
||||||
void VideoDragAbleFeature::Draw(bool highlighted) {
|
void VideoDraggableFeature::Draw(bool highlighted) {
|
||||||
}
|
}
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
////////////////
|
////////////////
|
||||||
// Feature type
|
// Feature type
|
||||||
enum DragAbleFeatureType {
|
enum DraggableFeatureType {
|
||||||
DRAG_NONE,
|
DRAG_NONE,
|
||||||
DRAG_BIG_SQUARE,
|
DRAG_BIG_SQUARE,
|
||||||
DRAG_BIG_CIRCLE,
|
DRAG_BIG_CIRCLE,
|
||||||
|
@ -55,9 +55,9 @@ enum DragAbleFeatureType {
|
||||||
|
|
||||||
/////////////////////
|
/////////////////////
|
||||||
// Drag-able feature
|
// Drag-able feature
|
||||||
class VideoDragAbleFeature {
|
class VideoDraggableFeature {
|
||||||
public:
|
public:
|
||||||
DragAbleFeatureType type;
|
DraggableFeatureType type;
|
||||||
int x,y;
|
int x,y;
|
||||||
int index;
|
int index;
|
||||||
AssDialogue *line;
|
AssDialogue *line;
|
||||||
|
@ -65,5 +65,5 @@ public:
|
||||||
bool IsMouseOver(int x,int y);
|
bool IsMouseOver(int x,int y);
|
||||||
void Draw(bool highlighted);
|
void Draw(bool highlighted);
|
||||||
|
|
||||||
VideoDragAbleFeature();
|
VideoDraggableFeature();
|
||||||
};
|
};
|
Loading…
Reference in a new issue