diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-05 18:26:02 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-05 19:24:53 +0400 |
| commit | 78d5f2b763d4de62f5a5b1097d71da551c3af5d3 (patch) | |
| tree | c9d80dcf878c434cda9e69c9b0157495adfee17e /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage | |
| parent | 92ac40ad826980e71c1adb80861ee67a8857d02c (diff) | |
Remove ImageService.GetPixbuf
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs | 10 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs index e5c48a77ee..566dc900ec 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs @@ -29,6 +29,7 @@ using Gtk; using MonoDevelop.Core;
using System.Xml.Linq;
using System.Text.RegularExpressions;
+using MonoDevelop.Components;
namespace MonoDevelop.Ide.WelcomePage
{
@@ -43,7 +44,7 @@ namespace MonoDevelop.Ide.WelcomePage Label subtitleLabel;
Label summaryLabel;
- Image image;
+ ImageView image;
string text, desc, icon, subtitle;
Gtk.IconSize iconSize = IconSize.Menu;
VBox box;
@@ -278,14 +279,11 @@ namespace MonoDevelop.Ide.WelcomePage return;
}
if (image == null) {
- image = new Gtk.Image ();
- int w, h;
- Gtk.Icon.SizeLookup (iconSize, out w, out h);
- image.IconSize = w;
+ image = new ImageView ();
box.PackStart (image, false, false, 0);
box.ReorderChild (image, 0);
}
- image.Pixbuf = ImageService.GetPixbuf (icon, iconSize);
+ image.Image = ImageService.GetIcon (icon, iconSize);
}
string CleanHtml (string txt)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs index 3b0aa53e6f..62408e28bd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageLinkButton.cs @@ -28,6 +28,7 @@ using System; using Gtk;
using MonoDevelop.Core;
using System.Xml.Linq;
+using MonoDevelop.Components;
namespace MonoDevelop.Ide.WelcomePage
{
@@ -38,7 +39,7 @@ namespace MonoDevelop.Ide.WelcomePage static readonly string descFormat = "<span size=\"small\" foreground=\"" + Styles.WelcomeScreen.Pad.TextColor + "\">{0}</span>";
Label label;
- Image image;
+ ImageView image;
string text, desc, icon;
Gtk.IconSize iconSize = IconSize.Menu;
HBox box;
@@ -145,14 +146,11 @@ namespace MonoDevelop.Ide.WelcomePage return;
}
if (image == null) {
- image = new Gtk.Image ();
- int w, h;
- Gtk.Icon.SizeLookup (iconSize, out w, out h);
- image.IconSize = w;
+ image = new ImageView ();
box.PackStart (image, false, false, 0);
box.ReorderChild (image, 0);
}
- image.Pixbuf = ImageService.GetPixbuf (icon, iconSize);
+ image.Image = ImageService.GetIcon (icon, iconSize);
}
public int MaxWidthChars {
|