github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rescan favorites folder when re-opening favorites chooser

Browse Source 
Previously we only scanned the folder when creating the favorites chooser singleton which meant items added or removed after the chooser had been used, were not reflected before a relaunch.

Fixes #1182
This commit is contained in:
Allan Odgaard
2013-11-08 21:12:48 +01:00
parent f2d5d0c143
commit f515d92bb4
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Applications/TextMate/src/Favorites.mm
View File

@@ -51,38 +51,43 @@
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[scrollView(==topDivider,==bottomDivider)]|" options:0 metrics:nil views:views]];
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[statusTextField]-[itemCountTextField]-|" options:NSLayoutFormatAlignAllCenterY metrics:nil views:views]];
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(2)-[searchField]-(8)-[topDivider][scrollView(>=50)][bottomDivider]-(4)-[statusTextField]-(5)-|" options:0 metrics:nil views:views]];
std::string const favoritesPath = oak::application_t::support("Favorites");
for(auto const& entry : path::entries(favoritesPath))
{
if(entry->d_type == DT_LNK)
{
std::string const path = path::resolve(path::join(favoritesPath, entry->d_name));
if(strncmp("[DIR] ", entry->d_name, 6) == 0)
{
for(auto const& subentry : path::entries(path))
{
if(subentry->d_type == DT_DIR)
favorites.emplace(text::format("%s — %s", subentry->d_name, entry->d_name + 6), path::join(path, subentry->d_name));
}
}
else
{
favorites.emplace(entry->d_name, path);
}
}
}
[self updateItems:self];
}
return self;
}
- (void)scanFavoritesDirectory:(id)sender
{
favorites.clear();
std::string const favoritesPath = oak::application_t::support("Favorites");
for(auto const& entry : path::entries(favoritesPath))
{
if(entry->d_type == DT_LNK)
{
std::string const path = path::resolve(path::join(favoritesPath, entry->d_name));
if(strncmp("[DIR] ", entry->d_name, 6) == 0)
{
for(auto const& subentry : path::entries(path))
{
if(subentry->d_type == DT_DIR)
favorites.emplace(text::format("%s — %s", subentry->d_name, entry->d_name + 6), path::join(path, subentry->d_name));
}
}
else
{
favorites.emplace(entry->d_name, path);
}
}
}
[self updateItems:self];
}
- (void)showWindow:(id)sender
{
if(![self.window isVisible])
{
self.filterString = @"";
[self scanFavoritesDirectory:self];
if([self.tableView numberOfRows])
[self.tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
}