AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Merge branch 'inscription-single-line' into 'main'"

Browse Source 
This reverts commit 7ec90abf24, reversing
changes made to ec49a912aa.

We did not have agreement on this after all.
This commit is contained in:
Matthias Clasen 2023-02-18 19:00:10 -05:00
parent 7ec90abf24
commit 3b3b63062d
2 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gtk/gtkinscription.c
View File

@ -70,7 +70,6 @@ struct _GtkInscription
guint nat_chars;
guint min_lines;
guint nat_lines;
gboolean single_line_mode;
float xalign;
float yalign;
PangoAttrList *attrs;
@ -88,7 +87,6 @@ enum
PROP_MIN_LINES,
PROP_NAT_CHARS,
PROP_NAT_LINES,
PROP_SINGLE_LINE_MODE,
PROP_TEXT,
PROP_TEXT_OVERFLOW,
PROP_WRAP_MODE,
@ -152,10 +150,6 @@ gtk_inscription_get_property (GObject *object,
g_value_set_uint (value, self->nat_lines);
break;
case PROP_SINGLE_LINE_MODE:
g_value_set_boolean (value, self->single_line_mode);
break;
case PROP_TEXT:
g_value_set_string (value, self->text);
break;
@ -216,10 +210,6 @@ gtk_inscription_set_property (GObject *object,
gtk_inscription_set_nat_lines (self, g_value_get_uint (value));
break;
case PROP_SINGLE_LINE_MODE:
gtk_inscription_set_single_line_mode (self, g_value_get_boolean (value));
break;
case PROP_TEXT:
gtk_inscription_set_text (self, g_value_get_string (value));
break;
@ -668,21 +658,6 @@ gtk_inscription_class_init (GtkInscriptionClass *klass)
DEFAULT_NAT_LINES,
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
/**
* GtkInscription:single-line-mode: (attributes org.gtk.Property.get=gtk_inscription_get_single_line_mode org.gtk.Property.set=gtk_inscription_set_single_line_mode)
*
* Whether the inscription is in single line mode.
*
* In single line mode, the text is forced to be displayed in a single line,
* showing a glyph for each newline character in it.
*
* Since: 4.10
*/
properties[PROP_SINGLE_LINE_MODE] =
g_param_spec_boolean ("single-line-mode", NULL, NULL,
FALSE,
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
/**
* GtkInscription:text: (attributes org.gtk.Property.get=gtk_inscription_get_text org.gtk.Property.set=gtk_inscription_set_text)
*
@ -1043,55 +1018,6 @@ gtk_inscription_get_nat_lines (GtkInscription *self)
return self->nat_lines;
}
/**
* gtk_inscription_set_single_line_mode: (attributes org.gtk.Method.set_property=single-line-mode)
* @self: a `GtkInscription`
* @single_line_mode: %TRUE if the inscription should be in single line mode
*
* Sets the `single-line-mode` of the inscription.
*
* See the [property@Gtk.Inscription:single-line-mode] property.
*
* Since: 4.10
*/
void
gtk_inscription_set_single_line_mode (GtkInscription *self,
gboolean single_line_mode)
{
g_return_if_fail (GTK_IS_INSCRIPTION (self));
if (self->single_line_mode == single_line_mode)
return;
self->single_line_mode = single_line_mode;
pango_layout_set_single_paragraph_mode (self->layout, self->single_line_mode);
gtk_widget_queue_draw (GTK_WIDGET (self));
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SINGLE_LINE_MODE]);
}
/**
* gtk_inscription_get_single_line_mode: (attributes org.gtk.Method.get_property=single-line-mode)
* @self: a `GtkInscription`
*
* Gets the `single-line-mode` of the inscription.
*
* See the [property@Gtk.Inscription:single-line-mode] property.
*
* Returns: the single-line-mode property
*
* Since: 4.10
*/
gboolean
gtk_inscription_get_single_line_mode (GtkInscription *self)
{
g_return_val_if_fail (GTK_IS_INSCRIPTION (self), FALSE);
return self->single_line_mode;
}
/**
* gtk_inscription_set_xalign: (attributes org.gtk.Method.set_property=xalign)
* @self: a `GtkInscription`

6
gtk/gtkinscription.h
View File

@ -100,12 +100,6 @@ GDK_AVAILABLE_IN_4_8
void gtk_inscription_set_nat_lines (GtkInscription *self,
guint nat_lines);
GDK_AVAILABLE_IN_4_10
gboolean gtk_inscription_get_single_line_mode (GtkInscription *self);
GDK_AVAILABLE_IN_4_10
void gtk_inscription_set_single_line_mode (GtkInscription *self,
gboolean single_line_mode);
GDK_AVAILABLE_IN_4_8
float gtk_inscription_get_xalign (GtkInscription *self);
GDK_AVAILABLE_IN_4_8