Revision: 6266
Author: nogu.dev
Date: Sun Mar 21 04:36:50 2010
Log: * qt4/immodule/caretstateindicator.cpp
- Define CaretStateIndicator::SPACING.
- (CaretStateIndicator::update): Use CaretStateIndicator::SPACING.
* qt4/immodule/caretstateindicator.h
- Declare CaretStateIndicator::SPACING.
* qt4/immodule/quiminputcontext.cpp
- (QUimInputContext::update): Use CaretStateIndicator::SPACING.
http://code.google.com/p/uim/source/detail?r=6266
Modified:
/trunk/qt4/immodule/caretstateindicator.cpp
/trunk/qt4/immodule/caretstateindicator.h
/trunk/qt4/immodule/quiminputcontext.cpp
=======================================
--- /trunk/qt4/immodule/caretstateindicator.cpp Sun Mar 21 03:13:00 2010
+++ /trunk/qt4/immodule/caretstateindicator.cpp Sun Mar 21 04:36:50 2010
@@ -40,6 +40,8 @@
#include <QtGui/QLabel>
#include <QtGui/QMoveEvent>
+const int CaretStateIndicator::SPACING = 3;
+
// caret state indicator is a state indicator nearby the caret.
CaretStateIndicator::CaretStateIndicator(QWidget *parent):
QWidget(parent, Qt::ToolTip), m_window(0)
@@ -90,7 +92,8 @@
QWidget *widget = QApplication::focusWidget();
if (widget) {
QRect rect = widget->inputMethodQuery(Qt::ImMicroFocus).toRect();
- move(widget->mapToGlobal(rect.bottomLeft()) + QPoint(0, 3));
+ move(widget->mapToGlobal(rect.bottomLeft())
+ + QPoint(0, CaretStateIndicator::SPACING));
m_window = widget->window();
m_window->installEventFilter(this);
}
=======================================
--- /trunk/qt4/immodule/caretstateindicator.h Sun Mar 21 00:08:58 2010
+++ /trunk/qt4/immodule/caretstateindicator.h Sun Mar 21 04:36:50 2010
@@ -47,6 +47,9 @@
void update(const QString &str);
void setTimeout(int second);
+ // space between this indicator and a caret
+ static const int SPACING;
+
private:
bool eventFilter(QObject *obj, QEvent *event);
QList<QLabel *> m_labelList;
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sun Mar 21 03:13:00 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Sun Mar 21 04:36:50 2010
@@ -475,7 +475,8 @@
QRect mf = w->inputMethodQuery( Qt::ImMicroFocus ).toRect();
QPoint p = w->mapToGlobal( mf.topLeft() );
setMicroFocus( p.x(), p.y(), mf.width(), mf.height() );
- m_indicator->move( w->mapToGlobal( mf.bottomLeft() ) + QPoint( 0,
3 ) );
+ m_indicator->move( w->mapToGlobal( mf.bottomLeft() )
+ + QPoint( 0, CaretStateIndicator::SPACING ) );
}
}
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
