[gnome-shell/gnome-3-28] st: Clip StEntry to allocation
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-28] st: Clip StEntry to allocation
- Date: Fri, 31 Aug 2018 14:11:13 +0000 (UTC)
commit ba33a05dd27e1c23bfcfbd4ac06fcb0d6e06ebf4
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Jun 15 12:23:21 2018 +0000
st: Clip StEntry to allocation
The default get_paint_volume() implementation will do the union
of children, and the child ClutterText paint volume may expand
beyond StEntry size when text overflows.
We actually want all content to be clipped to the StEntry, so
implement get_paint_volume() and tell it so.
(cherry picked from commit 86a520b880808ad18d397ab8e7a7a05b1a8b4e4c)
src/st/st-entry.c | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 42f554c03..f5305c524 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -906,6 +906,13 @@ st_entry_unmap (ClutterActor *actor)
CLUTTER_ACTOR_CLASS (st_entry_parent_class)->unmap (actor);
}
+static gboolean
+st_entry_get_paint_volume (ClutterActor *actor,
+ ClutterPaintVolume *volume)
+{
+ return clutter_paint_volume_set_from_allocation (volume, actor);
+}
+
static void
st_entry_class_init (StEntryClass *klass)
{
@@ -923,6 +930,7 @@ st_entry_class_init (StEntryClass *klass)
actor_class->allocate = st_entry_allocate;
actor_class->paint = st_entry_paint;
actor_class->unmap = st_entry_unmap;
+ actor_class->get_paint_volume = st_entry_get_paint_volume;
actor_class->key_press_event = st_entry_key_press_event;
actor_class->key_focus_in = st_entry_key_focus_in;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]