gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 03:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make drawing use the component cell to render

Browse source
This commit is contained in:
Gregory John Casamento 2020-05-06 08:38:31 -04:00
parent c67ca273a9
commit 7764903d6d
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Headers/Additions/GNUstepGUI/GSTheme.h
View file

@ -252,6 +252,8 @@
@class NSProgressIndicator;
@class NSTableHeaderCell;
@class NSTabViewItem;
@class NSPathControl;
@class NSPathComponentCell;
@class GSDrawTiles;
@class GSTitleView;
@ -975,9 +977,8 @@ APPKIT_EXPORT NSString *GSThemeWillDeactivateNotification;
// NSPathComponentCell
- (void) drawPathComponentCellWithFrame: (NSRect)f
inView: (NSView *)v
withURL: (NSURL *)u
image: (NSImage *)i
inView: (NSPathControl *)pc
withCell: (NSPathComponentCell *)cell
isLastComponent: (BOOL)last;
// NSSegmentedControl drawing methods

12
Source/GSThemeDrawing.m
View file

@ -954,19 +954,19 @@
// NSPathComponentCell
- (void) drawPathComponentCellWithFrame: (NSRect)f
inView: (NSView *)v
withURL: (NSURL *)u
image: (NSImage *)i
inView: (NSPathControl *)pc
withCell: (NSPathComponentCell *)cell
isLastComponent: (BOOL)lc
{
NSImage *i = [cell image];
NSURL *u = [cell URL];
NSString *string = [[u path] lastPathComponent];
NSRect textFrame = f;
NSRect imgFrame = f;
NSRect arrowFrame = f;
NSImage *arrowImage = [NSImage imageNamed: @"NSMenuArrow"];
NSPathControl *pc = (NSPathControl *)v;
NSPathStyle s = [pc pathStyle];
if (s == NSPathStyleStandard || s == NSPathStyleNavigationBar)
{
if (s == NSPathStyleNavigationBar)
@ -1005,7 +1005,7 @@
{
if (lc == YES)
{
NSRect newFrame = [v frame];
NSRect newFrame = [pc frame];
arrowImage = [NSImage imageNamed: @"common_ArrowDown"];

5
Source/NSPathComponentCell.m
View file

@ -58,9 +58,8 @@
{
[super drawInteriorWithFrame: f inView: v];
[[GSTheme theme] drawPathComponentCellWithFrame: f
inView: v
withURL: _url
image: _image
inView: (NSPathControl *)v
withCell: self
isLastComponent: _lastComponent];
}