Skip to content

Commit

Permalink
Revert "UI: Disable drag/drop on Linux scenes/sources (for now)"
Browse files Browse the repository at this point in the history
This reverts commit 457adce.

Requires obsproject/obs-browser#304
  • Loading branch information
GeorgesStavracas committed Jul 23, 2021
1 parent 21a9c5b commit 1e34b2f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
3 changes: 0 additions & 3 deletions UI/source-tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -883,11 +883,8 @@ Qt::ItemFlags SourceTreeModel::flags(const QModelIndex &index) const
obs_sceneitem_t *item = items[index.row()];
bool is_group = obs_sceneitem_is_group(item);

/* XXX: Disable drag/drop on Linux until Qt issues are fixed */
return QAbstractListModel::flags(index) | Qt::ItemIsEditable |
#if defined(_WIN32) || defined(__APPLE__)
Qt::ItemIsDragEnabled |
#endif
(is_group ? Qt::ItemIsDropEnabled : Qt::NoItemFlags);
}

Expand Down
5 changes: 0 additions & 5 deletions UI/window-basic-main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,6 @@ OBSBasic::OBSBasic(QWidget *parent)
ui->previewDisabledWidget->setVisible(false);
ui->contextContainer->setStyle(new OBSProxyStyle);

/* XXX: Disable drag/drop on Linux until Qt issues are fixed */
#if !defined(_WIN32) && !defined(__APPLE__)
ui->scenes->setDragDropMode(QAbstractItemView::NoDragDrop);
#endif

startingDockLayout = saveState();

statsDock = new OBSDock();
Expand Down

0 comments on commit 1e34b2f

Please sign in to comment.