summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/bookmark_manager_recent.pngbin0 -> 535 bytes
-rw-r--r--chrome/app/theme/bookmark_manager_search.pngbin0 -> 863 bytes
-rw-r--r--chrome/app/theme/theme_resources.h2
-rw-r--r--chrome/app/theme/theme_resources.rc2
-rw-r--r--chrome/browser/bookmarks/bookmark_folder_tree_model.cc18
-rw-r--r--chrome/browser/bookmarks/bookmark_folder_tree_model.h7
-rw-r--r--chrome/views/tree_view.cc103
-rw-r--r--chrome/views/tree_view.h17
8 files changed, 107 insertions, 42 deletions
diff --git a/chrome/app/theme/bookmark_manager_recent.png b/chrome/app/theme/bookmark_manager_recent.png
new file mode 100644
index 0000000..c79bdd4
--- /dev/null
+++ b/chrome/app/theme/bookmark_manager_recent.png
Binary files differ
diff --git a/chrome/app/theme/bookmark_manager_search.png b/chrome/app/theme/bookmark_manager_search.png
new file mode 100644
index 0000000..76abc27
--- /dev/null
+++ b/chrome/app/theme/bookmark_manager_search.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h
index a4cba37..03b34f2 100644
--- a/chrome/app/theme/theme_resources.h
+++ b/chrome/app/theme/theme_resources.h
@@ -314,3 +314,5 @@
#define IDR_PRODUCT_LOGO 9306
#define IDR_DISTRIBUTOR_LOGO 9307
#define IDR_DISTRIBUTOR_LOGO_LIGHT 9308
+#define IDR_BOOKMARK_MANAGER_RECENT_ICON 9309
+#define IDR_BOOKMARK_MANAGER_SEARCH_ICON 9310
diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc
index 58c3e8b..9826562 100644
--- a/chrome/app/theme/theme_resources.rc
+++ b/chrome/app/theme/theme_resources.rc
@@ -303,3 +303,5 @@ IDR_FIND_DLG_RIGHT_BB_BACKGROUND BINDATA "find_dlg_right_bb_bg.png"
IDR_FIND_DLG_MIDDLE_BB_BACKGROUND BINDATA "find_dlg_middle_bb_bg.png"
IDR_THROBBER_LIGHT BINDATA "throbber_light.png"
IDR_OTR_ICON_STANDALONE BINDATA "otr_icon_standalone.png"
+IDR_BOOKMARK_MANAGER_RECENT_ICON BINDATA "bookmark_manager_recent.png"
+IDR_BOOKMARK_MANAGER_SEARCH_ICON BINDATA "bookmark_manager_search.png"
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
index b1932a4..d5d8038 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
@@ -4,7 +4,9 @@
#include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
+#include "chrome/app/theme/theme_resources.h"
#include "chrome/common/l10n_util.h"
+#include "chrome/common/resource_bundle.h"
#include "generated_resources.h"
@@ -129,6 +131,22 @@ void BookmarkFolderTreeModel::BookmarkNodeChanged(BookmarkModel* model,
GetObserver()->TreeNodeChanged(this, folder_node);
}
+void BookmarkFolderTreeModel::GetIcons(std::vector<SkBitmap>* icons) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ icons->push_back(*rb.GetBitmapNamed(IDR_BOOKMARK_MANAGER_RECENT_ICON));
+ icons->push_back(*rb.GetBitmapNamed(IDR_BOOKMARK_MANAGER_SEARCH_ICON));
+}
+
+int BookmarkFolderTreeModel::GetIconIndex(views::TreeModelNode* node) {
+ if (node == recently_bookmarked_node_)
+ return 0;
+ if (node == search_node_)
+ return 1;
+
+ // Return -1 to use the default.
+ return -1;
+}
+
void BookmarkFolderTreeModel::AddRootChildren() {
Add(AsNode(GetRoot()), 0, CreateFolderNode(model_->GetBookmarkBarNode()));
Add(AsNode(GetRoot()), 1, CreateFolderNode(model_->other_node()));
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
index c2f7093..acf49f4 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
@@ -68,7 +68,12 @@ class BookmarkFolderTreeModel : public views::TreeNodeModel<FolderNode>,
virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
BookmarkNode* node) {}
- private:
+ // The following are overriden to return custom icons for the recently
+ // bookmarked and search nodes.
+ virtual void GetIcons(std::vector<SkBitmap>* icons);
+ virtual int GetIconIndex(views::TreeModelNode* node);
+
+private:
// Invoked from the constructor to create the children of the root node.
void AddRootChildren();
diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc
index a092b9a..d2c7dfb 100644
--- a/chrome/views/tree_view.cc
+++ b/chrome/views/tree_view.cc
@@ -18,36 +18,6 @@
namespace views {
-static HIMAGELIST tree_image_list_ = NULL;
-
-// Creates the default image list used for trees. The image list is populated
-// from the shell's icons.
-static HIMAGELIST CreateDefaultImageList(bool rtl) {
- SkBitmap* closed_icon =
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
- (rtl ? IDR_FOLDER_CLOSED_RTL : IDR_FOLDER_CLOSED));
- SkBitmap* opened_icon =
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
- (rtl ? IDR_FOLDER_OPEN_RTL : IDR_FOLDER_OPEN));
- int width = closed_icon->width();
- int height = closed_icon->height();
- DCHECK(opened_icon->width() == width && opened_icon->height() == height);
- HIMAGELIST image_list = ImageList_Create(width, height, ILC_COLOR32, 2, 2);
- if (image_list) {
- // NOTE: the order the images are added in effects the selected
- // image index when adding items to the tree. If you change the
- // order you'll undoubtedly need to update itemex.iSelectedImage
- // when the item is added.
- HICON h_closed_icon = IconUtil::CreateHICONFromSkBitmap(*closed_icon);
- HICON h_opened_icon = IconUtil::CreateHICONFromSkBitmap(*opened_icon);
- ImageList_AddIcon(image_list, h_closed_icon);
- ImageList_AddIcon(image_list, h_opened_icon);
- DestroyIcon(h_closed_icon);
- DestroyIcon(h_opened_icon);
- }
- return image_list;
-}
-
TreeView::TreeView()
: tree_view_(NULL),
model_(NULL),
@@ -61,7 +31,9 @@ TreeView::TreeView()
select_on_right_mouse_down_(true),
wrapper_(this),
original_handler_(NULL),
- drag_enabled_(false) {
+ drag_enabled_(false),
+ has_custom_icons_(false),
+ image_list_(NULL) {
}
TreeView::~TreeView() {
@@ -71,6 +43,8 @@ TreeView::~TreeView() {
// as such only need to delete from one.
STLDeleteContainerPairSecondPointers(id_to_details_map_.begin(),
id_to_details_map_.end());
+ if (image_list_)
+ ImageList_Destroy(image_list_);
}
void TreeView::SetModel(TreeModel* model) {
@@ -84,6 +58,11 @@ void TreeView::SetModel(TreeModel* model) {
if (tree_view_ && model_) {
CreateRootItems();
model_->SetObserver(this);
+ HIMAGELIST last_image_list = image_list_;
+ image_list_ = CreateImageList();
+ TreeView_SetImageList(tree_view_, image_list_, TVSIL_NORMAL);
+ if (last_image_list)
+ ImageList_Destroy(last_image_list);
}
}
@@ -309,16 +288,11 @@ HWND TreeView::CreateNativeControl(HWND parent_container) {
reinterpret_cast<LONG_PTR>(&wrapper_));
original_handler_ = win_util::SetWindowProc(tree_view_,
&TreeWndProc);
- // Tree-View doesn't render icons by default. Use an image list that is
- // populated with icons from the shell.
- if (!tree_image_list_)
- tree_image_list_ = CreateDefaultImageList(UILayoutIsRightToLeft());
- if (tree_image_list_)
- TreeView_SetImageList(tree_view_, tree_image_list_, TVSIL_NORMAL);
-
if (model_) {
CreateRootItems();
model_->SetObserver(this);
+ image_list_ = CreateImageList();
+ TreeView_SetImageList(tree_view_, image_list_, TVSIL_NORMAL);
}
// Bug 964884: detach the IME attached to this window.
@@ -541,13 +515,22 @@ void TreeView::CreateItem(HTREEITEM parent_item,
insert_struct.hParent = parent_item;
insert_struct.hInsertAfter = after;
insert_struct.itemex.mask = TVIF_PARAM | TVIF_CHILDREN | TVIF_TEXT |
- TVIF_SELECTEDIMAGE;
+ TVIF_SELECTEDIMAGE | TVIF_IMAGE;
// Call us back for the text.
insert_struct.itemex.pszText = LPSTR_TEXTCALLBACK;
// And the number of children.
insert_struct.itemex.cChildren = I_CHILDRENCALLBACK;
- // Index in the image list for the image when the node is selected.
- insert_struct.itemex.iSelectedImage = 1;
+ // Set the index of the icons to use. These are relative to the imagelist
+ // created in CreateImageList.
+ int icon_index = model_->GetIconIndex(node);
+ if (icon_index == -1) {
+ insert_struct.itemex.iImage = 0;
+ insert_struct.itemex.iSelectedImage = 1;
+ } else {
+ // The first two images are the default ones.
+ insert_struct.itemex.iImage = icon_index + 2;
+ insert_struct.itemex.iSelectedImage = icon_index + 2;
+ }
int node_id = next_id_++;
insert_struct.itemex.lParam = node_id;
@@ -590,6 +573,44 @@ TreeView::NodeDetails* TreeView::GetNodeDetailsByTreeItem(HTREEITEM tree_item) {
return NULL;
}
+HIMAGELIST TreeView::CreateImageList() {
+ std::vector<SkBitmap> model_images;
+ model_->GetIcons(&model_images);
+
+ bool rtl = UILayoutIsRightToLeft();
+ // Creates the default image list used for trees.
+ SkBitmap* closed_icon =
+ ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ (rtl ? IDR_FOLDER_CLOSED_RTL : IDR_FOLDER_CLOSED));
+ SkBitmap* opened_icon =
+ ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ (rtl ? IDR_FOLDER_OPEN_RTL : IDR_FOLDER_OPEN));
+ int width = closed_icon->width();
+ int height = closed_icon->height();
+ DCHECK(opened_icon->width() == width && opened_icon->height() == height);
+ HIMAGELIST image_list =
+ ImageList_Create(width, height, ILC_COLOR32, model_images.size() + 2,
+ model_images.size() + 2);
+ if (image_list) {
+ // NOTE: the order the images are added in effects the selected
+ // image index when adding items to the tree. If you change the
+ // order you'll undoubtedly need to update itemex.iSelectedImage
+ // when the item is added.
+ HICON h_closed_icon = IconUtil::CreateHICONFromSkBitmap(*closed_icon);
+ HICON h_opened_icon = IconUtil::CreateHICONFromSkBitmap(*opened_icon);
+ ImageList_AddIcon(image_list, h_closed_icon);
+ ImageList_AddIcon(image_list, h_opened_icon);
+ DestroyIcon(h_closed_icon);
+ DestroyIcon(h_opened_icon);
+ for (size_t i = 0; i < model_images.size(); ++i) {
+ HICON model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]);
+ ImageList_AddIcon(image_list, model_icon);
+ DestroyIcon(model_icon);
+ }
+ }
+ return image_list;
+}
+
LRESULT CALLBACK TreeView::TreeWndProc(HWND window,
UINT message,
WPARAM w_param,
diff --git a/chrome/views/tree_view.h b/chrome/views/tree_view.h
index a219f52..fb3f50e 100644
--- a/chrome/views/tree_view.h
+++ b/chrome/views/tree_view.h
@@ -72,6 +72,15 @@ class TreeModel {
const std::wstring& title) {
NOTREACHED();
}
+
+ // Returns the set of icons for the nodes in the tree. You only need override
+ // this if you don't want to use the default folder icons.
+ virtual void GetIcons(std::vector<SkBitmap>* icons) {}
+
+ // Returns the index of the icon to use for |node|. Return -1 to use the
+ // default icon. The index is relative to the list of icons returned from
+ // GetIcons.
+ virtual int GetIconIndex(TreeModelNode* node) { return -1; }
};
// TreeViewController ---------------------------------------------------------
@@ -284,6 +293,9 @@ class TreeView : public NativeControl, TreeModelObserver {
// Returns the NodeDetails by HTREEITEM.
NodeDetails* GetNodeDetailsByTreeItem(HTREEITEM tree_item);
+ // Creates the image list to use for the tree.
+ HIMAGELIST CreateImageList();
+
// The window function installed on the treeview.
static LRESULT CALLBACK TreeWndProc(HWND window,
UINT message,
@@ -335,6 +347,11 @@ class TreeView : public NativeControl, TreeModelObserver {
bool drag_enabled_;
+ // Did the model return a non-empty set of icons from GetIcons?
+ bool has_custom_icons_;
+
+ HIMAGELIST image_list_;
+
DISALLOW_COPY_AND_ASSIGN(TreeView);
};
generated by cgit v1.1 at 2025-02-08 02:15:34 +0000