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

Draw PaletteView selection like Timeline selection

Browse Source
This commit is contained in:
David Capello 2015-03-19 19:45:12 -03:00
parent 7d104f9ec1
commit e2b8d2be31
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/skins/default/skin.xml
View File

@ -13,6 +13,7 @@
<dim id="timeline_top_border" value="2" />
<dim id="timeline_tags_area_height" value="4" />
<dim id="timeline_outline_width" value="2" />
<dim id="palette_outline_width" value="3" />
</dimensions>
<colors>

49
src/app/ui/palette_view.cpp
View File

@ -14,11 +14,13 @@
#include "app/modules/gui.h"
#include "app/modules/palettes.h"
#include "app/ui/palette_view.h"
#include "app/ui/skin/skin_theme.h"
#include "app/ui/skin/style.h"
#include "app/ui/status_bar.h"
#include "gfx/point.h"
#include "doc/blend.h"
#include "doc/image.h"
#include "doc/palette.h"
#include "gfx/point.h"
#include "ui/graphics.h"
#include "ui/manager.h"
#include "ui/message.h"
@ -35,6 +37,7 @@
namespace app {
using namespace ui;
using namespace app::skin;
WidgetType palette_view_type()
{
@ -46,6 +49,9 @@ WidgetType palette_view_type()
PaletteView::PaletteView(bool editable)
: Widget(palette_view_type())
, m_editable(editable)
, m_columns(16)
, m_boxsize(7*guiscale())
, m_currentEntry(-1)
, m_rangeAnchor(-1)
, m_selectedEntries(Palette::MaxColors, false)
@ -54,10 +60,6 @@ PaletteView::PaletteView(bool editable)
setFocusStop(true);
setDoubleBuffered(true);
m_editable = editable;
m_columns = 16;
m_boxsize = 6*guiscale();
this->border_width.l = this->border_width.r = 1 * guiscale();
this->border_width.t = this->border_width.b = 1 * guiscale();
this->child_spacing = 1 * guiscale();
@ -263,6 +265,8 @@ bool PaletteView::onProcessMessage(Message* msg)
void PaletteView::onPaint(ui::PaintEvent& ev)
{
SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
int outlineWidth = theme->dimensions.paletteOutlineWidth();
ui::Graphics* g = ev.getGraphics();
gfx::Rect bounds = getClientBounds();
div_t d = div(Palette::MaxColors, m_columns);
@ -275,12 +279,11 @@ void PaletteView::onPaint(ui::PaintEvent& ev)
g->fillRect(gfx::rgba(0 , 0, 0), bounds);
// Draw palette entries
y = bounds.y + this->border_width.t;
c = 0;
for (v=0; v<rows; v++) {
x = bounds.x + this->border_width.l;
for (u=0; u<cols; u++) {
if (c >= palette->size())
break;
@ -291,6 +294,20 @@ void PaletteView::onPaint(ui::PaintEvent& ev)
rgba_getb(palette->getEntry(c)));
g->fillRect(color, gfx::Rect(x, y, m_boxsize, m_boxsize));
x += m_boxsize+this->child_spacing;
c++;
}
y += m_boxsize+this->child_spacing;
}
// Draw selected entries
y = bounds.y + this->border_width.t;
c = 0;
for (v=0; v<rows; v++) {
x = bounds.x + this->border_width.l;
for (u=0; u<cols; u++) {
if (c >= palette->size())
break;
if (m_selectedEntries[c]) {
const int max = Palette::MaxColors;
@ -299,16 +316,24 @@ void PaletteView::onPaint(ui::PaintEvent& ev)
bool left = ((c%m_columns)>0 && c-1 >= 0 ? m_selectedEntries[c-1]: false);
bool right = ((c%m_columns)<m_columns-1 && c+1 < max ? m_selectedEntries[c+1]: false);
if (!top ) g->drawHLine(bordercolor, x-1, y-1, m_boxsize+2);
if (!bottom) g->drawHLine(bordercolor, x-1, y+m_boxsize, m_boxsize+2);
if (!left ) g->drawVLine(bordercolor, x-1, y-1, m_boxsize+2);
if (!right ) g->drawVLine(bordercolor, x+m_boxsize, y-1, m_boxsize+2);
gfx::Rect bounds(x, y, m_boxsize, m_boxsize);
gfx::Rect clipR = bounds;
bounds.enlarge(outlineWidth);
if (!top ) clipR.y -= outlineWidth, clipR.h += outlineWidth;
if (!bottom) clipR.h += outlineWidth;
if (!left ) clipR.x -= outlineWidth, clipR.w += outlineWidth;
if (!right ) clipR.w += outlineWidth;
IntersectClip clip(g, clipR);
if (clip) {
theme->styles.timelineRangeOutline()->paint(g, bounds,
NULL, Style::active());
}
}
x += m_boxsize+this->child_spacing;
c++;
}
y += m_boxsize+this->child_spacing;
}
}