Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DeskBar: remove app name from expanded window items

Browse Source 
Expanded window items are listed right under the team item. So, it is
not needed (and a waste of space) to repeat the team name there.

Detect two common patterns for adding the application name to windows:

AppName: Window

and

Window - AppName

Remove both from the item labels, leaving a little more space for useful
information in DeskBar.
This commit is contained in:
Adrien Destugues 2017-08-15 10:55:50 +02:00
parent 43d60df2b0
commit b32b2f9028
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apps/deskbar/ExpandoMenuBar.cpp
View File

@ -994,24 +994,37 @@ TExpandoMenuBar::monitor_team_windows(void* arg)
if (wInfo == NULL)
continue;
BString windowName(wInfo->name);
BString teamPrefix(teamItem->Label());
teamPrefix.Append(": ");
BString teamSuffix(" - ");
teamSuffix.Append(teamItem->Label());
if (windowName.StartsWith(teamPrefix))
windowName.RemoveFirst(teamPrefix);
if (windowName.EndsWith(teamSuffix))
windowName.RemoveLast(teamSuffix);
if (TWindowMenu::WindowShouldBeListed(wInfo)) {
// Check if we have a matching window item...
item = teamItem->ExpandedWindowItem(
wInfo->server_token);
if (item != NULL) {
item->SetTo(wInfo->name,
item->SetTo(windowName,
wInfo->server_token, wInfo->is_mini,
((1 << current_workspace())
& wInfo->workspaces) != 0);
if (strcasecmp(item->Label(), wInfo->name) > 0)
item->SetLabel(wInfo->name);
if (strcasecmp(item->Label(), windowName) > 0)
item->SetLabel(windowName);
if (item->Modified())
itemModified = true;
} else if (teamItem->IsExpanded()) {
// Add the item
item = new TWindowMenuItem(wInfo->name,
item = new TWindowMenuItem(windowName,
wInfo->server_token, wInfo->is_mini,
((1 << current_workspace())
& wInfo->workspaces) != 0, false);