New upstream version 23.2.1+dfsg1
This commit is contained in:
parent
cdc9a9fc87
commit
b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions
|
|
@ -31,6 +31,8 @@ enum class ItemHandle : uint32_t {
|
|||
class OBSBasicPreview : public OBSQTDisplay {
|
||||
Q_OBJECT
|
||||
|
||||
friend class SourceTree;
|
||||
|
||||
private:
|
||||
obs_sceneitem_crop startCrop;
|
||||
vec2 startItemPos;
|
||||
|
|
@ -43,6 +45,8 @@ private:
|
|||
matrix4 itemToScreen;
|
||||
matrix4 invGroupTransform;
|
||||
|
||||
gs_texture_t *overflow = nullptr;
|
||||
|
||||
vec2 startPos;
|
||||
vec2 lastMoveOffset;
|
||||
vec2 scrollingFrom;
|
||||
|
|
@ -57,7 +61,12 @@ private:
|
|||
int32_t scalingLevel = 0;
|
||||
float scalingAmount = 1.0f;
|
||||
|
||||
obs_sceneitem_t *hoveredPreviewItem = nullptr;
|
||||
obs_sceneitem_t *hoveredListItem = nullptr;
|
||||
|
||||
static vec2 GetMouseEventPos(QMouseEvent *event);
|
||||
static bool DrawSelectedOverflow(obs_scene_t *scene,
|
||||
obs_sceneitem_t *item, void *param);
|
||||
static bool DrawSelectedItem(obs_scene_t *scene, obs_sceneitem_t *item,
|
||||
void *param);
|
||||
|
||||
|
|
@ -84,6 +93,9 @@ private:
|
|||
|
||||
public:
|
||||
OBSBasicPreview(QWidget *parent, Qt::WindowFlags flags = 0);
|
||||
~OBSBasicPreview();
|
||||
|
||||
static OBSBasicPreview *Get();
|
||||
|
||||
virtual void keyPressEvent(QKeyEvent *event) override;
|
||||
virtual void keyReleaseEvent(QKeyEvent *event) override;
|
||||
|
|
@ -93,7 +105,9 @@ public:
|
|||
virtual void mousePressEvent(QMouseEvent *event) override;
|
||||
virtual void mouseReleaseEvent(QMouseEvent *event) override;
|
||||
virtual void mouseMoveEvent(QMouseEvent *event) override;
|
||||
virtual void leaveEvent(QEvent *event) override;
|
||||
|
||||
void DrawOverflow();
|
||||
void DrawSceneEditing();
|
||||
|
||||
inline void SetLocked(bool newLockedVal) {locked = newLockedVal;}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue