mirror of
https://github.com/aseprite/aseprite.git
synced 2024-09-02 13:09:27 +00:00
Merge branch 'main' into beta
This commit is contained in:
commit
05bf34f084
@ -519,6 +519,10 @@
|
|||||||
<background color="tooltip_face" />
|
<background color="tooltip_face" />
|
||||||
<text color="tooltip_text" align="left" />
|
<text color="tooltip_text" align="left" />
|
||||||
</style>
|
</style>
|
||||||
|
<style id="textbox_text" align="left top wordwrap" border="4">
|
||||||
|
<background color="textbox_face" />
|
||||||
|
<text color="textbox_text" align="left" />
|
||||||
|
</style>
|
||||||
<style id="label" padding="1">
|
<style id="label" padding="1">
|
||||||
<text color="text" align="left" />
|
<text color="text" align="left" />
|
||||||
<text color="disabled" align="left" state="disabled" />
|
<text color="disabled" align="left" state="disabled" />
|
||||||
|
@ -512,6 +512,10 @@
|
|||||||
<background color="tooltip_face" />
|
<background color="tooltip_face" />
|
||||||
<text color="tooltip_text" align="left" />
|
<text color="tooltip_text" align="left" />
|
||||||
</style>
|
</style>
|
||||||
|
<style id="textbox_text" align="left top wordwrap" border="4">
|
||||||
|
<background color="textbox_face" />
|
||||||
|
<text color="textbox_text" align="left" />
|
||||||
|
</style>
|
||||||
<style id="label" padding="1">
|
<style id="label" padding="1">
|
||||||
<text color="text" align="left" />
|
<text color="text" align="left" />
|
||||||
<text color="disabled" align="left" state="disabled" />
|
<text color="disabled" align="left" state="disabled" />
|
||||||
|
@ -913,9 +913,8 @@ void SkinTheme::initWidget(Widget* widget)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case kTextBoxWidget:
|
case kTextBoxWidget:
|
||||||
BORDER(4*guiscale());
|
|
||||||
widget->setChildSpacing(0);
|
widget->setChildSpacing(0);
|
||||||
widget->setBgColor(colors.textboxFace());
|
widget->setStyle(styles.textboxText());
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case kViewWidget:
|
case kViewWidget:
|
||||||
|
@ -1931,7 +1931,7 @@ bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
|
|||||||
// Restore overlays in the region that we're going to paint.
|
// Restore overlays in the region that we're going to paint.
|
||||||
OverlayManager::instance()->restoreOverlappedAreas(paintMsg->rect());
|
OverlayManager::instance()->restoreOverlappedAreas(paintMsg->rect());
|
||||||
|
|
||||||
os::Surface* surface = display->surface();
|
os::SurfaceRef surface(base::AddRef(display->surface()));
|
||||||
surface->saveClip();
|
surface->saveClip();
|
||||||
|
|
||||||
if (surface->clipRect(paintMsg->rect())) {
|
if (surface->clipRect(paintMsg->rect())) {
|
||||||
|
@ -294,10 +294,9 @@ void Theme::paintTooltip(Graphics* g,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Size Theme::paintTextBoxWithStyle(Graphics* g,
|
void Theme::paintTextBoxWithStyle(Graphics* g,
|
||||||
const Widget* widget)
|
const Widget* widget)
|
||||||
{
|
{
|
||||||
gfx::Size size;
|
|
||||||
gfx::Color bg = gfx::ColorNone, fg = gfx::ColorNone;
|
gfx::Color bg = gfx::ColorNone, fg = gfx::ColorNone;
|
||||||
|
|
||||||
for_each_layer(
|
for_each_layer(
|
||||||
@ -311,9 +310,7 @@ gfx::Size Theme::paintTextBoxWithStyle(Graphics* g,
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (fg != gfx::ColorNone)
|
if (fg != gfx::ColorNone)
|
||||||
Theme::drawTextBox(g, widget, &size.w, &size.h, bg, fg);
|
Theme::drawTextBox(g, widget, nullptr, nullptr, bg, fg);
|
||||||
|
|
||||||
return size;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Theme::paintLayer(Graphics* g,
|
void Theme::paintLayer(Graphics* g,
|
||||||
|
@ -101,8 +101,8 @@ namespace ui {
|
|||||||
const int arrowAlign,
|
const int arrowAlign,
|
||||||
const gfx::Rect& target);
|
const gfx::Rect& target);
|
||||||
|
|
||||||
gfx::Size paintTextBoxWithStyle(Graphics* g,
|
void paintTextBoxWithStyle(Graphics* g,
|
||||||
const Widget* widget);
|
const Widget* widget);
|
||||||
|
|
||||||
virtual gfx::Size calcSizeHint(const Widget* widget,
|
virtual gfx::Size calcSizeHint(const Widget* widget,
|
||||||
const Style* style);
|
const Style* style);
|
||||||
|
Loading…
Reference in New Issue
Block a user