Ticket #11394: 0003-Button-add-a-SetIcon-resourceID-convenience-method.patch

docs/user/interface/Control.dox

@@ -495 +495 @@
 
 
 /*!
+    \fn status_t BControl::SetIcon(const int32 resourceID, uint32 flags)
+    \brief This convenience method is used to set the bitmaps
+           for the standard states from a single bitmap.
+
+    \param resourceID The ID of a vector icon resource in the 
+        application's binary.
+    \param flags Modify how the icon is set.
+    - \c B_TRIM_ICON_BITMAP Crop the bitmap to the not fully transparent
+         area, may change the icon size.
+    - \c B_TRIM_ICON_BITMAP_KEEP_ASPECT Like \c B_TRIM_BITMAP, but keeps
+         the aspect ratio.
+    - \c B_CREATE_ACTIVE_ICON_BITMAP
+    - \c B_CREATE_PARTIALLY_ACTIVE_ICON_BITMAP
+    - \c B_CREATE_DISABLED_ICON_BITMAPS
+
+    \return \c B_OK if the icon was set or an error code otherwise.
+
+    \since Haiku R1
+*/
+
+
+/*!
     \fn status_t BControl::SetIconBitmap(const BBitmap* bitmap,
         uint32 which, uint32 flags)
     \brief Icon bitmaps for various states of the control (off, on,

headers/os/interface/Control.h

@@ -76 +76 @@
 
     virtual status_t            SetIcon(const BBitmap* bitmap,
                                     uint32 flags = 0);
+            status_t            SetIcon(const int32 resourceID,
+                                    uint32 flags = 0);
             status_t            SetIconBitmap(const BBitmap* bitmap,
                                     uint32 which, uint32 flags = 0);
             const BBitmap*      IconBitmap(uint32 which) const;

src/kits/interface/Control.cpp

@@ -14 +14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <Application.h>
+#include <Bitmap.h>
 #include <Control.h>
+#include <IconUtils.h>
 #include <PropertyInfo.h>
+#include <Resources.h>
+#include <Roster.h>
 #include <Window.h>
 
 #include <binary_compatibility/Interface.h>
@@ -542 +547 @@
 
 
 status_t
+BControl::SetIcon(const int32 resourceID, uint32 flags)
+{
+    app_info info;
+    status_t status = be_app->GetAppInfo(&info);
+    if (status != B_OK)
+        return status;
+
+    BResources resources(&info.ref);
+    status = resources.InitCheck();
+    if (status != B_OK)
+        return status;
+
+    size_t size;
+    const void* data = resources.LoadResource(B_VECTOR_ICON_TYPE, resourceID,
+        &size);
+    if (data == NULL) 
+        return B_ENTRY_NOT_FOUND;
+    
+    BBitmap bitmap(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_RGBA32);
+    status = bitmap.InitCheck();
+    if (status != B_OK)
+        return status;
+    status = BIconUtils::GetVectorIcon(reinterpret_cast<const uint8*>(data),
+        size, &bitmap);
+    if (status != B_OK)
+        return status;
+    return SetIcon(&bitmap, flags);
+}
+
+
+status_t
 BControl::SetIconBitmap(const BBitmap* bitmap, uint32 which, uint32 flags)
 {
     status_t error = BIcon::SetIconBitmap(bitmap, which, flags, fIcon);