isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

text: Use the keymap direction when focused

Browse Source 
If the ClutterText actor has key focus then we should ask for the
direction of the key map, instead of the direction of the actor.

https://bugzilla.gnome.org/show_bug.cgi?id=705779
This commit is contained in:
Emmanuele Bassi 2014-03-03 23:25:08 +00:00
parent 3209129d6b
commit c73f45ca7c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/clutter-text.c
View File

@ -49,6 +49,7 @@
#include "clutter-actor-private.h" #include "clutter-actor-private.h"
#include "clutter-animatable.h" #include "clutter-animatable.h"
#include "clutter-backend-private.h"
#include "clutter-binding-pool.h" #include "clutter-binding-pool.h"
#include "clutter-color.h" #include "clutter-color.h"
#include "clutter-debug.h" #include "clutter-debug.h"
@ -539,14 +540,20 @@ clutter_text_create_layout_no_cache (ClutterText *text,
if (pango_dir == PANGO_DIRECTION_NEUTRAL) if (pango_dir == PANGO_DIRECTION_NEUTRAL)
{ {
ClutterBackend *backend = clutter_get_default_backend ();
ClutterTextDirection text_dir; ClutterTextDirection text_dir;
text_dir = clutter_actor_get_text_direction (CLUTTER_ACTOR (text)); if (clutter_actor_has_key_focus (CLUTTER_ACTOR (text)))
pango_dir = _clutter_backend_get_keymap_direction (backend);
if (text_dir == CLUTTER_TEXT_DIRECTION_RTL)
pango_dir = PANGO_DIRECTION_RTL;
else else
pango_dir = PANGO_DIRECTION_LTR; {
text_dir = clutter_actor_get_text_direction (CLUTTER_ACTOR (text));
if (text_dir == CLUTTER_TEXT_DIRECTION_RTL)
pango_dir = PANGO_DIRECTION_RTL;
else
pango_dir = PANGO_DIRECTION_LTR;
}
} }
pango_context_set_base_dir (clutter_actor_get_pango_context (CLUTTER_ACTOR (text)), pango_dir); pango_context_set_base_dir (clutter_actor_get_pango_context (CLUTTER_ACTOR (text)), pango_dir);