summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-10 10:19:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-10 10:21:38 +0100
commit4cd0f67562770eb3e88efa9072add80ac2f80c06 (patch)
treeac284c61e128fc085ec2a036142ded4723eac76e /vcl
parentMissing break in switch (diff)
downloadcore-4cd0f67562770eb3e88efa9072add80ac2f80c06.tar.gz
core-4cd0f67562770eb3e88efa9072add80ac2f80c06.zip
EXTTEXTINPUT_CURSOR_INVISIBLE is set on the wrong field
Change-Id: I6d92c86035dd321eb6df46bcd01aed7a0113b0a4
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx3
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 3a8014c41948..e82317207dc9 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3749,7 +3749,8 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
switch (pango_attr->klass->type)
{
case PANGO_ATTR_BACKGROUND:
- sal_attr |= (EXTTEXTINPUT_ATTR_HIGHLIGHT | EXTTEXTINPUT_CURSOR_INVISIBLE);
+ sal_attr |= EXTTEXTINPUT_ATTR_HIGHLIGHT;
+ pThis->m_aInputEvent.mnCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE;
break;
case PANGO_ATTR_UNDERLINE:
sal_attr |= EXTTEXTINPUT_ATTR_UNDERLINE;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 099bae155c9d..c37911f4b23e 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3821,7 +3821,8 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
switch (pango_attr->klass->type)
{
case PANGO_ATTR_BACKGROUND:
- sal_attr |= (EXTTEXTINPUT_ATTR_HIGHLIGHT | EXTTEXTINPUT_CURSOR_INVISIBLE);
+ sal_attr |= EXTTEXTINPUT_ATTR_HIGHLIGHT;
+ pThis->m_aInputEvent.mnCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE;
break;
case PANGO_ATTR_UNDERLINE:
sal_attr |= EXTTEXTINPUT_ATTR_UNDERLINE;