Skip to content

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

macosx: implemented pressed state for the effects button (bright UI) (refs #7408) 

Manual backport of a38092cd83d85fe232a18b1e3c4581440043b742
parent f2e3d211
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 115 deletions
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ fb582ac1
...@@ -296,6 +296,8 @@ ...@@ -296,6 +296,8 @@
CC9191A2159B55B700E634A7 /* dropzone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9191A1159B55B700E634A7 /* dropzone@2x.png */; }; CC9191A2159B55B700E634A7 /* dropzone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9191A1159B55B700E634A7 /* dropzone@2x.png */; };
CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43AE13B29C79000205AE /* bottom-background.png */; }; CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43AE13B29C79000205AE /* bottom-background.png */; };
CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43B013B29FCF000205AE /* bottom-background_dark.png */; }; CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43B013B29FCF000205AE /* bottom-background_dark.png */; };
CCAEE983160747F500DE42D6 /* effects-one-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CCAEE981160747F500DE42D6 /* effects-one-button-pressed.png */; };
CCAEE984160747F500DE42D6 /* effects-one-button-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCAEE982160747F500DE42D6 /* effects-one-button-pressed@2x.png */; };
CCB320721423AAEE002CB53B /* shuffle-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CCB320711423AAEE002CB53B /* shuffle-blue.png */; }; CCB320721423AAEE002CB53B /* shuffle-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CCB320711423AAEE002CB53B /* shuffle-blue.png */; };
CCBAA742159B5A7800D8348C /* back-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCBAA716159B5A7800D8348C /* back-pressed@2x.png */; }; CCBAA742159B5A7800D8348C /* back-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCBAA716159B5A7800D8348C /* back-pressed@2x.png */; };
CCBAA743159B5A7800D8348C /* back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCBAA717159B5A7800D8348C /* back@2x.png */; }; CCBAA743159B5A7800D8348C /* back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CCBAA717159B5A7800D8348C /* back@2x.png */; };
...@@ -767,6 +769,8 @@ ...@@ -767,6 +769,8 @@
CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = "<group>"; }; CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = "<group>"; };
CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = "<group>"; }; CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = "<group>"; };
CC9E3E7913D1CFCF00429A71 /* qtcapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = qtcapture.m; path = ../../../modules/access/qtcapture.m; sourceTree = "<group>"; }; CC9E3E7913D1CFCF00429A71 /* qtcapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = qtcapture.m; path = ../../../modules/access/qtcapture.m; sourceTree = "<group>"; };
CCAEE981160747F500DE42D6 /* effects-one-button-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed.png"; path = "Resources/mainwindow/effects-one-button-pressed.png"; sourceTree = "<group>"; };
CCAEE982160747F500DE42D6 /* effects-one-button-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed@2x.png"; path = "Resources/mainwindow/effects-one-button-pressed@2x.png"; sourceTree = "<group>"; };
CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CompatibilityFixes.h; path = ../../../modules/gui/macosx/CompatibilityFixes.h; sourceTree = "<group>"; }; CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CompatibilityFixes.h; path = ../../../modules/gui/macosx/CompatibilityFixes.h; sourceTree = "<group>"; };
CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; }; CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; };
CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; }; CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; };
...@@ -1215,6 +1219,8 @@ ...@@ -1215,6 +1219,8 @@
CCBAA71B159B5A7800D8348C /* effects-double-buttons@2x.png */, CCBAA71B159B5A7800D8348C /* effects-double-buttons@2x.png */,
CCBAA71C159B5A7800D8348C /* effects-one-button-blue@2x.png */, CCBAA71C159B5A7800D8348C /* effects-one-button-blue@2x.png */,
CCBAA71D159B5A7800D8348C /* effects-one-button@2x.png */, CCBAA71D159B5A7800D8348C /* effects-one-button@2x.png */,
CCAEE981160747F500DE42D6 /* effects-one-button-pressed.png */,
CCAEE982160747F500DE42D6 /* effects-one-button-pressed@2x.png */,
CCBAA71E159B5A7800D8348C /* forward-pressed@2x.png */, CCBAA71E159B5A7800D8348C /* forward-pressed@2x.png */,
CCBAA71F159B5A7800D8348C /* forward@2x.png */, CCBAA71F159B5A7800D8348C /* forward@2x.png */,
CCBAA720159B5A7800D8348C /* fullscreen-double-buttons-pressed@2x.png */, CCBAA720159B5A7800D8348C /* fullscreen-double-buttons-pressed@2x.png */,
...@@ -2005,6 +2011,8 @@ ...@@ -2005,6 +2011,8 @@
CCBAA7AD159B5B3F00D8348C /* sidebar-pictures@2x.png in Resources */, CCBAA7AD159B5B3F00D8348C /* sidebar-pictures@2x.png in Resources */,
CCBAA7AE159B5B3F00D8348C /* sidebar-playlist@2x.png in Resources */, CCBAA7AE159B5B3F00D8348C /* sidebar-playlist@2x.png in Resources */,
CCBAA7AF159B5B3F00D8348C /* sidebar-podcast@2x.png in Resources */, CCBAA7AF159B5B3F00D8348C /* sidebar-podcast@2x.png in Resources */,
CCAEE983160747F500DE42D6 /* effects-one-button-pressed.png in Resources */,
CCAEE984160747F500DE42D6 /* effects-one-button-pressed@2x.png in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
......
modules/gui/macosx/MainWindow.m
View file @ fb582ac1
...@@ -232,7 +232,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -232,7 +232,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if (b_nativeFullscreenMode) if (b_nativeFullscreenMode)
{ {
[o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]]; [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue"]]; [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-pressed"]];
} }
else 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