Fix for hiding drag count text#228
Merged
tedwaine merged 1 commit intoAcademySoftwareFoundation:developfrom Mar 23, 2026
Merged
Fix for hiding drag count text#228tedwaine merged 1 commit intoAcademySoftwareFoundation:developfrom
tedwaine merged 1 commit intoAcademySoftwareFoundation:developfrom
Conversation
When only one item is being dragged, the count badge is supposed to be hidden. While the red disk does correctly hide itself the text component wasn’t. This fixes that. Signed-off-by: kenmcgaugh <ken@mcgaugh.co.uk>
tedwaine
merged commit 71051c4
into
AcademySoftwareFoundation:develop
2 of 3 checks passed
tedwaine
pushed a commit
that referenced
this pull request
Mar 24, 2026
When only one item is being dragged, the count badge is supposed to be hidden. While the red disk does correctly hide itself the text component wasn’t. This fixes that. Signed-off-by: kenmcgaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com>
tedwaine
pushed a commit
that referenced
this pull request
Mar 24, 2026
When only one item is being dragged, the count badge is supposed to be hidden. While the red disk does correctly hide itself the text component wasn’t. This fixes that. Signed-off-by: kenmcgaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com>
tedwaine
pushed a commit
that referenced
this pull request
Mar 24, 2026
When only one item is being dragged, the count badge is supposed to be hidden. While the red disk does correctly hide itself the text component wasn’t. This fixes that. Signed-off-by: kenmcgaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com>
tedwaine
added a commit
that referenced
this pull request
Mar 24, 2026
* Remove empty parent menus when menu item is deleted. Signed-off-by: Ted Waine <ted.waine@gmail.com> * Implement OIIO reader Signed-off-by: Thomas Manceau <manceau.thomas19@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Add OIIO metadata Signed-off-by: Thomas Manceau <manceau.thomas19@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Change openimageio version in vcpkg.json Updated version of openimageio from 2.5.19.1 to 2.5.16.0#1. Signed-off-by: Thomas Manceau <manceau.thomas19@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Add remove_media_source_atom and associated handler to media_actor. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Allow udta metadata tags to be passed through. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fixed incorrect keycode for MetaModifier. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fixed missing parentheses reported by compiler. This now matches the annotation_serialiser.cpp. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Exposed additional methods and constructors for MediaReference, FrameList, and Timecode. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Exposse the AltModifier to python, which was the one modifier missing. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Change to prevent sources provided by non-file URL schemes to be marked as MS_MISSING. This allows for media_sources to be provided by http(s). Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * This MacOS-only fix prevents an "stroull" error message when a .DS_Store file exists in a thumbnail cache directory. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Added empty event_atom/name_atom message handler to prevent error message. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Added missing override keyword to avoid compiler warning. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fixed typo in show_viewer_hotkey text. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Small fixes to avoid benign QML warnings. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Modified OCIOEngine::get_ocio_config() to pass the "ocio_config" metadata value through xstudio's file-path remapping mechanism. Likewise, all the search paths within the config are also passed through file path remapping. Note that any path set via the OCIO environment variable is left as-is. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Modifications to allow the "working_space" be set via the source colour management metadata. We use this to set the working_space to "raw" for media we want to remain unmanaged but still allow for the global view to be set without causing error messages. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * This adds hotkeys for changing the current OCIO view. The hotkeys are Ctrl+1 through Ctrl+9 (linux) and each select the the corresponding view for the current display. Under MacOS these are Cmd+1 through Cmd+9. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Just a couple of typos corrected. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Allow for optionally disabling SSL verification. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Sync with latest DNEG internal repo Signed-off-by: Ted Waine <ted.waine@gmail.com> * Re-instate OTIO submodule Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix merge problems Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix Win namespace issue Signed-off-by: Ted Waine <ted.waine@gmail.com> * Sync to DNEG internal Signed-off-by: Ted Waine <ted.waine@gmail.com> * Clang format Signed-off-by: Ted Waine <ted.waine@gmail.com> * Tweak media reader precedence Signed-off-by: Ted Waine <ted.waine@gmail.com> * fix: Use platform-specific path separators for `XSTUDIO_PLUGIN_PATH`. Signed-off-by: Hugh Macdonald <hugh@hughmacdonald.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix slow media loading into large playlists and timelines Signed-off-by: Ted Waine <ted.waine@gmail.com> * Sync to DNEG internal repo Signed-off-by: Ted Waine <ted.waine@gmail.com> * Added support for specifying timelines to import via an URI instead of posix path to an OTIO file. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix for an occaisional crash caused by an uncaught exception when changing the URI of the currently viewed media_source. This seemed the safest fix although there are others I tried but I was worried about the potential impact on performance. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix event subscription to use event_group instead of event_source.remote Signed-off-by: Ted Waine <ted.waine@gmail.com> * These modifications allow the pasteing of clipboard data containing custom mime-data. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Add Windows .cmd wrappers for Python CLI scripts On Windows, extensionless shell scripts aren't executable. Add .cmd batch wrappers for xstudio-control, xstudio-inject, and xstudiopy that set PYTHONPATH and invoke the bundled Python interpreter. The existing Linux/macOS scripts are unchanged — CMake selects the right variant per platform. Remove the non-functional xstudio.bat.in template, which was a copy of the Linux shell launcher containing Linux-only constructs (LD_LIBRARY_PATH, xstudio_desktop_integration). On Windows, xstudio.exe is invoked directly and needs no wrapper. Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix cross-platform plugin path splitting on Windows Use os.pathsep instead of hardcoded ":" to split XSTUDIO_PYTHON_PLUGIN_PATH, since Windows uses ";" as the path separator and ":" would break drive letters. Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Strip whitespace from plugin search paths Env var values can contain trailing whitespace depending on how they are set (e.g. cmd.exe "set VAR=value && cmd"), causing path lookups to fail. Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix Windows frame sequence scanning in frame_groups_from_sequence_spec Use generic_string() instead of string() for directory entries. path::string() returns OS-native separators (backslashes on Windows), while the regex is built from URI-decoded paths that use forward slashes. generic_string() always returns forward slashes, so the regex matches correctly. Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix Windows UNC path handling in URI conversion Add proper UNC path support for Windows: - posix_path_to_uri: Convert \\server\share\path to file://server/share/path - uri_to_posix_path: Reconstruct \\server\share\path from file://server/share/path This fixes drag-and-drop of image sequences from network shares on Windows. Also fix a pre-existing bug where reverse_remap_file_path was called on the original input parameter instead of the working copy, discarding any transformations applied earlier in the function. Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix Windows drive-letter paths producing non-standard file URIs On Windows, paths like R:\foo were passed directly to the URI builder without normalising backslashes or prepending a leading slash, producing invalid file URIs. Normalise to forward slashes and prepend / for drive-letter paths so they produce correct file:///R:/foo URIs. Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Improvements to drag-n-drop within the MediaList views. This includes changing the cursor to be a grab of the item being dragged along with a badge showing the number of items being dragged. It also fixes some issues causing instabilities or awkwardness in the UI relating to drag-n-drop. Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * OpenGL compatibility for Wayland, prevent crash with incompatible GPU (#216) * Request desktop OpenGL explicitly for Wayland/EGL compatibility On Wayland, Qt uses EGL for OpenGL context creation. Without explicit request, EGL may default to OpenGL ES, but xstudio shaders require GLSL 410+ (desktop OpenGL 4.1+). Add setRenderableType(QSurfaceFormat::OpenGL) to explicitly request desktop OpenGL while maintaining native Wayland performance. Signed-off-by: Ben De Luca <bdeluca@gmail.com> * Add OpenGL version check at startup Check GPU capabilities before loading the QML engine. Logs the GL vendor, renderer and version string, and exits cleanly if the context version is below the minimum required (4.3, or 4.1 on macOS). Replaces the previous hard-coded setVersion call with shared required_gl_major/required_gl_minor constants. Signed-off-by: Ben De Luca <bdeluca@gmail.com> --------- Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Adding WIP demo (data source) plugin (#203) Signed-off-by: Ted Waine <ted.waine@gmail.com> * ninja build for windows (#217) * Add Ninja build presets and /MP guard for Windows Add windows-ninja-base preset and three derived presets (Debug, Release, RelWithDebInfo) that use the Ninja generator. Guard the MSVC /MP compile option so it is only added for MSBuild generators — Ninja already parallelizes at the file level, so /MP would over-subscribe CPUs. Add CMakeUserPresets.json to .gitignore so developers can create local preset overrides (e.g. custom Qt paths) without dirtying the working tree. CMake reads CMakeUserPresets.json automatically alongside CMakePresets.json. Signed-off-by: Ben De Luca <bdeluca@gmail.com> * Add Ninja build instructions to Windows build guide Document how to use the Ninja presets as an alternative to MSBuild. Uses Enter-VsDevShell to set up the MSVC compiler, cmake and ninja on PATH from a standard Powershell session. Signed-off-by: Ben De Luca <bdeluca@gmail.com> --------- Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * fix(windows): prefer discrete GPU on hybrid graphics systems, Add NvOptimusEnablement and AmdPowerXpressRequestHighPerformance exports to hint the NVIDIA/AMD driver to select the discrete GPU on Windows hybrid graphics system (#218) Signed-off-by: Vikas Kendre <vikaskendre1989@gmail.com> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix for hiding drag count text (#228) When only one item is being dragged, the count badge is supposed to be hidden. While the red disk does correctly hide itself the text component wasn’t. This fixes that. Signed-off-by: kenmcgaugh <ken@mcgaugh.co.uk> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Sync all changes from DNEG internal repo Signed-off-by: Ted Waine <ted.waine@gmail.com> * Adding Blackmagic Designs Decklink SDI card video output plugin Signed-off-by: Ted Waine <ted.waine@gmail.com> * Add license stub and cleanup old files Signed-off-by: Ted Waine <ted.waine@gmail.com> * Make the doc paths relative. Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org> Signed-off-by: Ted Waine <ted.waine@gmail.com> * Update version number Signed-off-by: Ted Waine <ted.waine@gmail.com> * Re-instate OTIO submodule Signed-off-by: Ted Waine <ted.waine@gmail.com> * Fix warnings in demo plugin Signed-off-by: Ted Waine <ted.waine@gmail.com> * clang format pass Signed-off-by: Ted Waine <ted.waine@gmail.com> * Windows build compatibility fix Signed-off-by: Ted Waine <ted.waine@gmail.com> --------- Signed-off-by: Ted Waine <ted.waine@gmail.com> Signed-off-by: Thomas Manceau <manceau.thomas19@gmail.com> Signed-off-by: Ken McGaugh <ken@mcgaugh.co.uk> Signed-off-by: Hugh Macdonald <hugh@hughmacdonald.co.uk> Signed-off-by: Ben De Luca <bdeluca@gmail.com> Signed-off-by: Vikas Kendre <vikaskendre1989@gmail.com> Signed-off-by: kenmcgaugh <ken@mcgaugh.co.uk> Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org> Co-authored-by: Thomas Manceau <manceau.thomas19@gmail.com> Co-authored-by: Ken McGaugh <ken@mcgaugh.co.uk> Co-authored-by: Hugh Macdonald <hugh@hughmacdonald.co.uk> Co-authored-by: Julien Hery <julien.hery@yahoo.fr> Co-authored-by: Ben de Luca <bdeluca@gmail.com> Co-authored-by: VIKASKENDRE <30403300+VIKASKENDRE@users.noreply.github.com> Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When only one item is being dragged, the count badge is supposed to be hidden. While the red disk does correctly hide itself the text component wasn’t. This fixes that.
Linked issues
Summarize your change.
Describe the reason for the change.
Describe what you have tested and on which operating system.
Add a list of changes, and note any that might need special attention during the review.
If possible, provide screenshots.