Skip to content

V
vlc-gpu
Commit fb32a825 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: implemented pressed state for the effects button (dark UI) (close #7408) 

(cherry picked from commit 2f747cb43fc664c5cb180e8fc92bdd78510d277e)

Conflicts:
	extras/package/macosx/vlc.xcodeproj/project.pbxproj
	modules/gui/macosx/ControlsBar.m
parent 92c08ecd
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
Makefile.am
View file @ fb32a825
......@@ -308,6 +308,8 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ fb32a825
......@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
7DFFA17416125157001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA17216125157001AF89F /* effects-one-button-pressed-dark.png */; };
7DFFA17516125157001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA17316125157001AF89F /* effects-one-button-pressed-dark@2x.png */; };
CC04323B13B246DF00D7D52E /* back_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321113B246DF00D7D52E /* back_dark.png */; };
CC04323C13B246DF00D7D52E /* back-pressed_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321213B246DF00D7D52E /* back-pressed_dark.png */; };
CC04323D13B246DF00D7D52E /* effects-double-buttons_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */; };
......@@ -419,6 +421,8 @@
5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsManager.m; path = ../../../modules/gui/macosx/ExtensionsManager.m; sourceTree = SOURCE_ROOT; };
5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUIWidgets.h; path = ../../../modules/gui/macosx/VLCUIWidgets.h; sourceTree = SOURCE_ROOT; };
5CCED71514C0D4A90057F8D1 /* VLCUIWidgets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCUIWidgets.m; path = ../../../modules/gui/macosx/VLCUIWidgets.m; sourceTree = SOURCE_ROOT; };
7DFFA17216125157001AF89F /* effects-one-button-pressed-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark.png"; sourceTree = "<group>"; };
7DFFA17316125157001AF89F /* effects-one-button-pressed-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark@2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png"; sourceTree = "<group>"; };
8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
8E49720106417F6800370C9F /* playlistinfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlistinfo.m; path = ../../../modules/gui/macosx/playlistinfo.m; sourceTree = SOURCE_ROOT; };
8E55FB7F0459B0FD00FB3317 /* output.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../../modules/gui/macosx/output.h; sourceTree = SOURCE_ROOT; };
......@@ -1138,6 +1142,8 @@
CC919155159B53CE00E634A7 /* play-pressed_dark@2x.png */,
CC919156159B53CE00E634A7 /* playlist-blue_dark@2x.png */,
CC919157159B53CE00E634A7 /* playlist-blue-pressed_dark@2x.png */,
7DFFA17216125157001AF89F /* effects-one-button-pressed-dark.png */,
7DFFA17316125157001AF89F /* effects-one-button-pressed-dark@2x.png */,
CC919158159B53CE00E634A7 /* effects-double-buttons_dark@2x.png */,
CC919159159B53CE00E634A7 /* effects-double-buttons-pressed_dark@2x.png */,
CC91915A159B53CE00E634A7 /* effects-one-button_dark@2x.png */,
......@@ -2013,6 +2019,8 @@
CCBAA7AF159B5B3F00D8348C /* sidebar-podcast@2x.png in Resources */,
CCAEE983160747F500DE42D6 /* effects-one-button-pressed.png in Resources */,
CCAEE984160747F500DE42D6 /* effects-one-button-pressed@2x.png in Resources */,
7DFFA17416125157001AF89F /* effects-one-button-pressed-dark.png in Resources */,
7DFFA17516125157001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
modules/gui/macosx/MainWindow.m
View file @ fb32a825
......@@ -284,7 +284,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if (b_nativeFullscreenMode)
{
[o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button_dark"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue_dark"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-pressed-dark"]];
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment