Skip to content

Added the option to show the app icons on the left or right side. #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Saoclyph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added the option to show the app icons on the left or right side. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions preferences/Resources/PriorityHub.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,15 @@ items = (
label = "Icon Location";
validValues = (
0,
1
1,
2,
3
);
validTitles = (
"Top",
"Bottom"
"Bottom",
"Left",
"Right"
);
},
{
Expand Down
33 changes: 23 additions & 10 deletions source/PHContainerView.xm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,29 @@
}

//Layout all app views
CGFloat totalWidth = [[appViews allKeys] count] * [self appViewSize].width;
self.contentSize = CGSizeMake(totalWidth, [self appViewSize].height);
CGFloat startX = (CGRectGetWidth(self.frame) - totalWidth)/2;
if (startX < 0)
startX = 0;

for (PHAppView *appView in [appViews allValues]) {
appView.frame = CGRectMake(startX, 0, [self appViewSize].width, [self appViewSize].height);
startX += [self appViewSize].width;
}
if ( [defaults integerForKey:@"iconLocation"] < 2) {
CGFloat totalWidth = [[appViews allKeys] count] * [self appViewSize].width;
self.contentSize = CGSizeMake(totalWidth, [self appViewSize].height);
CGFloat startX = (CGRectGetWidth(self.frame) - totalWidth)/2;
if (startX < 0)
startX = 0;

for (PHAppView *appView in [appViews allValues]) {
appView.frame = CGRectMake(startX, 0, [self appViewSize].width, [self appViewSize].height);
startX += [self appViewSize].width;
}
} else {
CGFloat totalHeight = [[appViews allKeys] count] * [self appViewSize].height;
self.contentSize = CGSizeMake([self appViewSize].width, totalHeight);
CGFloat startY = (CGRectGetHeight(self.frame) - totalHeight)/2;
if (startY < 0)
startY = 0;

for (PHAppView *appView in [appViews allValues]) {
appView.frame = CGRectMake(0, startY, [self appViewSize].width, [self appViewSize].height);
startY += [self appViewSize].height;
}
}

//Update selected view location
if (selectedView.alpha == 1 && selectedAppID && [appViews objectForKey:selectedAppID])
Expand Down
9 changes: 7 additions & 2 deletions source/Tweak.xm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,15 @@ void showTestNotification() {
containerView.frame = CGRectMake(containerView.frame.origin.x, containerView.frame.origin.y + verticalAdjustmentTop, containerView.frame.size.width, containerView.frame.size.height - verticalAdjustmentTop + verticalAdjustmentBottom);

//Layout PHContainerView and notifications table view
if ([defaults integerForKey:@"iconLocation"] == 0) //App icons at top
int iconLocation = [defaults integerForKey:@"iconLocation"];
if (iconLocation == 0) //App icons at top
CGRectDivide(containerView.bounds, &phContainerViewFrame, &tableViewFrame, [phContainerView appViewSize].height, CGRectMinYEdge);
else //App icons at bottom
else if (iconLocation == 1)//App icons at bottom
CGRectDivide(containerView.bounds, &phContainerViewFrame, &tableViewFrame, [phContainerView appViewSize].height, CGRectMaxYEdge);
else if (iconLocation == 2)//App icons at left
CGRectDivide(containerView.bounds, &phContainerViewFrame, &tableViewFrame, [phContainerView appViewSize].width, CGRectMinXEdge);
else //App icons at right
CGRectDivide(containerView.bounds, &phContainerViewFrame, &tableViewFrame, [phContainerView appViewSize].width, CGRectMaxXEdge);

phContainerView.frame = phContainerViewFrame;
notificationsTableView.frame = tableViewFrame;
Expand Down