Merge branch 'master' into staging

elemanhillary · Jul 12, 2022 · d42ca71 · d42ca71
2 parents 6db1502 + 7fd510b
commit d42ca71
Show file tree

Hide file tree

Showing 32 changed files with 727 additions and 48 deletions.
diff --git a/app/app-services.ts b/app/app-services.ts
@@ -123,6 +123,7 @@ import { EditorCommandsService } from './services/editor-commands';
 import { EditorService } from 'services/editor';
 import { PerformanceService } from './services/performance';
 import { SourcesService } from './services/sources';
+import { SelectionService } from './services/selection';
 import { StreamingService } from './services/streaming';
 import { StreamSettingsService } from './services/settings/streaming';
 import { RestreamService } from './services/restream';
@@ -190,6 +191,7 @@ export const AppServices = {
   EditorService,
   PerformanceService,
   SourcesService,
+  SelectionService,
   PatchNotesService,
   VideoService,
   ChatService,

diff --git a/app/components-react/editor/elements/SceneSelector.m.less b/app/components-react/editor/elements/SceneSelector.m.less
@@ -15,6 +15,18 @@
     top: 0 !important;
     height: 100%;
   }
+
+  :global(.active) {
+    color: var(--icon-active);
+  }
+
+  :global(.disabled) {
+    opacity: 0.7;
+
+    &:hover {
+      cursor: not-allowed;
+    }
+  }
 }
 
 :global(.no-top-padding) {
@@ -38,7 +50,7 @@
   }
 }
 
-.active-scene {
+.active-scene, .source-title {
   display: block;
   overflow: hidden;
   white-space: nowrap;
@@ -48,6 +60,7 @@
 .scenes-container {
   background: var(--section);
   border-radius: 4px;
+  height: 100%;
 
   &:global(.os-host) {
     overflow: hidden !important;
@@ -69,6 +82,7 @@
 
   :global(.ant-tree-node-content-wrapper) {
     padding-left: 16px !important;
+    display: flex;
   }
 
   :global(.ant-tree-node-selected) {
@@ -112,3 +126,54 @@
     }
   }
 }
+
+.source-icons {
+  display: flex;
+  align-items: center;
+  margin-right: 16px;
+
+  i {
+    margin-left: 8px;
+  }
+}
+
+.source-title-container {
+  display: flex;
+  align-items: center;
+
+  > i {
+    margin-right: 8px;
+  }
+}
+
+.source-title {
+  margin-right: auto;
+}
+
+.sources-container {
+  :global(.ant-tree-switcher) {
+    width: 0;
+    display: block;
+    z-index: 1;
+    left: 10px;
+  }
+
+  :global(.ant-tree-node-content-wrapper) {
+    padding-left: 32px !important;
+    display: flex;
+  }
+
+  :global(.ant-tree-title) {
+    display: block;
+    width: 100%;
+  }
+
+  :global(.fa-folder) {
+    &:hover {
+      &::before {
+        content: "\f07c";
+      }
+      color: var(--title);
+    }
+  }
+}