AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

label: Respect box-shadow when computing clip

Browse Source 
Testclase included.

Also reorder headers to be alphabetic.
This commit is contained in:
Benjamin Otte 2014-08-21 00:02:29 +02:00
parent b5a8b7ef3b
commit 1126a34353
5 changed files with 70 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtklabel.c
View File

@ -30,28 +30,28 @@
#include "gtklabel.h"
#include "gtklabelprivate.h"
#include "gtkaccellabel.h"
#include "gtkbindings.h"
#include "gtkbuildable.h"
#include "gtkclipboard.h"
#include "gtkcssshadowsvalueprivate.h"
#include "gtkdnd.h"
#include "gtkmarshalers.h"
#include "gtkpango.h"
#include "gtkwindow.h"
#include "gtkclipboard.h"
#include "gtkimage.h"
#include "gtkintl.h"
#include "gtkseparatormenuitem.h"
#include "gtktextutil.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkmenuitem.h"
#include "gtkmenushellprivate.h"
#include "gtknotebook.h"
#include "gtkbindings.h"
#include "gtkbuildable.h"
#include "gtkimage.h"
#include "gtkpango.h"
#include "gtkprivate.h"
#include "gtkseparatormenuitem.h"
#include "gtkshow.h"
#include "gtkstylecontextprivate.h"
#include "gtktextutil.h"
#include "gtktooltip.h"
#include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkmain.h"
#include "gtkwidgetprivate.h"
#include "gtkwindow.h"
#include "a11y/gtklabelaccessibleprivate.h"
@ -3997,7 +3997,7 @@ gtk_label_size_allocate (GtkWidget *widget,
gtk_label_get_ink_rect (label, &clip_rect);
gdk_rectangle_union (&clip_rect, allocation, &clip_rect);
gtk_widget_set_clip (widget, &clip_rect);
_gtk_widget_set_simple_clip (widget, &clip_rect);
}
static void

3
testsuite/reftests/Makefile.am
View File

@ -252,6 +252,9 @@ testdata = \
label-background.css \
label-background.ref.ui \
label-background.ui \
label-box-shadow-clip.css \
label-box-shadow-clip.ref.ui \
label-box-shadow-clip.ui \
label-clipping.css \
label-clipping.ref.ui \
label-clipping.ui \

9
testsuite/reftests/label-box-shadow-clip.css Normal file
View File

@ -0,0 +1,9 @@
@import "reset-to-defaults.css";
.test {
box-shadow: 0 0 0 1px red;
}
.reference {
border: 1px solid red;
}

23
testsuite/reftests/label-box-shadow-clip.ref.ui Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.1 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkWindow" id="window1">
<property name="width_request">100</property>
<property name="height_request">100</property>
<property name="can_focus">False</property>
<property name="type">popup</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="label" translatable="yes">X</property>
<style>
<class name="reference"/>
</style>
</object>
</child>
</object>
</interface>

23
testsuite/reftests/label-box-shadow-clip.ui Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.1 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkWindow" id="window1">
<property name="width_request">100</property>
<property name="height_request">100</property>
<property name="can_focus">False</property>
<property name="type">popup</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="label" translatable="yes">X</property>
<style>
<class name="test"/>
</style>
</object>
</child>
</object>
</interface>