[vlc-commits] [Git][videolan/vlc][master] macosx: move dropzone image to asset catalog
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Aug 4 08:47:26 UTC 2026
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
6e3a1eb8 by Serhii Bykov at 2026-08-04T08:35:58+00:00
macosx: move dropzone image to asset catalog
- - - - -
9 changed files:
- modules/gui/macosx/Makefile.am
- + modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/Contents.json
- + modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark.png
- + modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark at 2x.png
- + modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone.png
- + modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone at 2x.png
- modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
- modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
- modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
Changes:
=====================================
modules/gui/macosx/Makefile.am
=====================================
@@ -7,7 +7,12 @@ actool_verbose__0 = $(actool_verbose_0)
# so that it is properly rebuilt when its content changes.
ASSET_CATALOG_DEPS = \
gui/macosx/Resources/Assets.xcassets/Contents.json \
- gui/macosx/Resources/Assets.xcassets/VLCAccentColor.colorset/Contents.json
+ gui/macosx/Resources/Assets.xcassets/VLCAccentColor.colorset/Contents.json \
+ gui/macosx/Resources/Assets.xcassets/dropzone.imageset/Contents.json \
+ gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark.png \
+ gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark at 2x.png \
+ gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone.png \
+ gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone at 2x.png
gui/macosx/Resources/Assets.car: gui/macosx/Resources/Assets.xcassets $(ASSET_CATALOG_DEPS)
$(AM_V_at)$(MKDIR_P) "gui/macosx/Resources"
@@ -703,9 +708,6 @@ libmacosx_plugin_la_RES = \
gui/macosx/Resources/mainwindow/backward-6btns-pressed at 2x.png \
gui/macosx/Resources/mainwindow/backward-6btns.png \
gui/macosx/Resources/mainwindow/backward-6btns at 2x.png \
- gui/macosx/Resources/mainwindow/dropzone-background.png \
- gui/macosx/Resources/mainwindow/dropzone.png \
- gui/macosx/Resources/mainwindow/dropzone at 2x.png \
gui/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \
gui/macosx/Resources/mainwindow/effects-double-buttons-pressed at 2x.png \
gui/macosx/Resources/mainwindow/effects-double-buttons.png \
=====================================
modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/Contents.json
=====================================
@@ -0,0 +1,54 @@
+{
+ "images" : [
+ {
+ "filename" : "dropzone.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "filename" : "dropzone-dark.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "dropzone at 2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "filename" : "dropzone-dark at 2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
=====================================
modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark.png
=====================================
Binary files /dev/null and b/modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark.png differ
=====================================
modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark at 2x.png
=====================================
Binary files /dev/null and b/modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone-dark at 2x.png differ
=====================================
modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone.png
=====================================
Binary files /dev/null and b/modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone.png differ
=====================================
modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone at 2x.png
=====================================
Binary files /dev/null and b/modules/gui/macosx/Resources/Assets.xcassets/dropzone.imageset/dropzone at 2x.png differ
=====================================
modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
=====================================
@@ -11,7 +11,6 @@
<outlet property="bottomButtonsSeparator" destination="ew3-Pn-diG" id="N5L-cw-953"/>
<outlet property="buttonStack" destination="hc5-GJ-yJe" id="cvF-K1-cq5"/>
<outlet property="clearButton" destination="aKS-lw-hfk" id="30D-7g-SnA"/>
- <outlet property="dragDropImageBackgroundBox" destination="aUB-Ld-N2o" id="9xc-5h-uRF"/>
<outlet property="dragDropView" destination="grx-kk-1X1" id="b1W-Zw-a7Z"/>
<outlet property="footerContainerView" destination="ftr-ct-999" id="ftr-o1-999"/>
<outlet property="footerContainerViewDefaultBottomConstraint" destination="ftr-bot-999" id="y58-xy-3xa"/>
@@ -215,14 +214,6 @@
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="grx-kk-1X1" customClass="VLCDragDropView">
<rect key="frame" x="0.0" y="50" width="510" height="210"/>
<subviews>
- <box boxType="custom" borderType="line" borderWidth="0.0" cornerRadius="10" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="aUB-Ld-N2o">
- <rect key="frame" x="188" y="38" width="134" height="134"/>
- <view key="contentView" id="9Ay-rU-2bA">
- <rect key="frame" x="0.0" y="0.0" width="134" height="134"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- </view>
- <color key="borderColor" name="separatorColor" catalog="System" colorSpace="catalog"/>
- </box>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="qv6-Mn-ifA" customClass="VLCDropDisabledImageView">
<rect key="frame" x="199" y="49" width="112" height="112"/>
<constraints>
@@ -244,18 +235,14 @@
</subviews>
<constraints>
<constraint firstItem="qv6-Mn-ifA" firstAttribute="centerY" secondItem="grx-kk-1X1" secondAttribute="centerY" id="AO4-Hd-L52"/>
- <constraint firstItem="aUB-Ld-N2o" firstAttribute="centerX" secondItem="qv6-Mn-ifA" secondAttribute="centerX" id="DKc-9E-HYo"/>
- <constraint firstItem="aUB-Ld-N2o" firstAttribute="width" secondItem="qv6-Mn-ifA" secondAttribute="width" multiplier="1.2" id="Jkb-0O-auX"/>
- <constraint firstItem="ghp-DI-YmZ" firstAttribute="top" secondItem="aUB-Ld-N2o" secondAttribute="bottom" constant="8" id="XFC-9r-Q8L" customClass="VLCSpacingConstraint">
+ <constraint firstItem="ghp-DI-YmZ" firstAttribute="top" secondItem="qv6-Mn-ifA" secondAttribute="bottom" constant="8" id="XFC-9r-Q8L" customClass="VLCSpacingConstraint">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="spacingToken">
<integer value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</constraint>
- <constraint firstItem="aUB-Ld-N2o" firstAttribute="height" secondItem="qv6-Mn-ifA" secondAttribute="height" multiplier="1.2" id="eJ2-wz-BJL"/>
<constraint firstItem="ghp-DI-YmZ" firstAttribute="centerX" secondItem="qv6-Mn-ifA" secondAttribute="centerX" id="gL5-uR-Smy"/>
- <constraint firstItem="aUB-Ld-N2o" firstAttribute="centerY" secondItem="qv6-Mn-ifA" secondAttribute="centerY" id="yfU-xa-zSE"/>
<constraint firstItem="qv6-Mn-ifA" firstAttribute="centerX" secondItem="grx-kk-1X1" secondAttribute="centerX" id="z8g-fU-cRw"/>
</constraints>
</customView>
=====================================
modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
=====================================
@@ -38,7 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readwrite, weak) IBOutlet NSTableView *tableView;
@property (readwrite, weak) IBOutlet NSView *footerContainerView;
@property (readwrite, weak) IBOutlet VLCDragDropView *dragDropView;
- at property (readwrite, weak) IBOutlet NSBox *dragDropImageBackgroundBox;
@property (readwrite, weak) IBOutlet NSButton *openMediaButton;
@property (readwrite, weak) IBOutlet NSBox *bottomButtonsSeparator;
@property (readwrite, weak) IBOutlet NSButton *repeatButton;
=====================================
modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
=====================================
@@ -80,7 +80,6 @@
[self.tableView reloadData];
self.openMediaButton.title = _NS("Open media...");
- self.dragDropImageBackgroundBox.fillColor = NSColor.VLClibrarySeparatorLightColor;
// Allow the drop zone image to shrink when the sidebar is contracted
for (NSView * const subview in self.dragDropView.subviews) {
@@ -99,9 +98,6 @@
break;
}
}
- [self.dragDropImageBackgroundBox.topAnchor
- constraintGreaterThanOrEqualToAnchor:self.dragDropView.topAnchor
- constant:VLCUIUnits.smallSpacing].active = YES;
[self.dragDropView.bottomAnchor
constraintGreaterThanOrEqualToAnchor:self.openMediaButton.bottomAnchor
constant:VLCUIUnits.smallSpacing].active = YES;
@@ -271,10 +267,8 @@
// better idea to pull from the general system theme preference, which is always up-to-date
if (isDark) {
self.bottomButtonsSeparator.borderColor = NSColor.VLClibrarySeparatorDarkColor;
- self.dragDropImageBackgroundBox.hidden = NO;
} else {
self.bottomButtonsSeparator.borderColor = NSColor.VLClibrarySeparatorLightColor;
- self.dragDropImageBackgroundBox.hidden = YES;
}
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6e3a1eb80a48a25f390d1c2d899feeac2b49fd05
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6e3a1eb80a48a25f390d1c2d899feeac2b49fd05
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list