mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-27 03:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change ui::ImageView to use she::Surface instead of Allegro BITMAP

Browse Source
This commit is contained in:
David Capello 2014-06-22 18:57:30 -03:00
parent dbad153698
commit 10bd7142eb
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ui/image_view.cpp
View File

@ -8,12 +8,11 @@
#include "config.h"
#endif
#include <allegro/draw.h>
#include <allegro/gfx.h>
#include "ui/image_view.h"
#include "she/surface.h"
#include "ui/draw.h"
#include "ui/graphics.h"
#include "ui/image_view.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
@ -22,8 +21,9 @@
namespace ui {
ImageView::ImageView(BITMAP* bmp, int align)
ImageView::ImageView(she::Surface* sur, int align)
: Widget(kImageViewWidget)
, m_sur(sur)
{
setAlign(align);
}
@ -32,10 +32,12 @@ void ImageView::onPreferredSize(PreferredSizeEvent& ev)
{
gfx::Rect box;
getTextIconInfo(&box, NULL, NULL,
getAlign(), m_bmp->w, m_bmp->h);
getAlign(), m_sur->width(), m_sur->height());
ev.setPreferredSize(gfx::Size(border_width.l + box.w + border_width.r,
border_width.t + box.h + border_width.b));
ev.setPreferredSize(
gfx::Size(
border_width.l + box.w + border_width.r,
border_width.t + box.h + border_width.b));
}
void ImageView::onPaint(PaintEvent& ev)
@ -43,10 +45,11 @@ void ImageView::onPaint(PaintEvent& ev)
Graphics* g = ev.getGraphics();
gfx::Rect bounds = getClientBounds();
gfx::Rect icon;
getTextIconInfo(NULL, NULL, &icon, getAlign(), m_bmp->w, m_bmp->h);
getTextIconInfo(NULL, NULL, &icon, getAlign(),
m_sur->width(), m_sur->height());
g->fillRect(getBgColor(), bounds);
g->blit(m_bmp, 0, 0, icon.x, icon.y, icon.w, icon.h);
g->drawRgbaSurface(m_sur, icon.x, icon.y);
}
} // namespace ui

8
src/ui/image_view.h
View File

@ -11,21 +11,23 @@
#include "base/compiler_specific.h"
#include "ui/widget.h"
struct BITMAP;
namespace she {
class Surface;
}
namespace ui {
class ImageView : public Widget
{
public:
ImageView(BITMAP* bmp, int align);
ImageView(she::Surface* sur, int align);
protected:
void onPreferredSize(PreferredSizeEvent& ev) OVERRIDE;
void onPaint(PaintEvent& ev) OVERRIDE;
private:
BITMAP* m_bmp;
she::Surface* m_sur;
};
} // namespace ui