tk.git - Tk is a free and open-source, cross-platform widget toolkit that provides a library of basic elements of GUI widgets for building a graphical user interface (GUI) in many programming languages.

Tk is a free and open-source, cross-platform widget toolkit that provides a library of basic elements of GUI widgets for building a graphical user interface (GUI) in many programming languages.

summary refs log tree commit diff stats

path: root/generic/tkRectOval.c

diff options

author	nijtmans <nijtmans>	2010-01-14 22:05:54 (GMT)
committer	nijtmans <nijtmans>	2010-01-14 22:05:54 (GMT)
commit	4bb5c7bd2b86a922be6f8106241dde924dd16c53 (patch)
tree	a0be11a66a484e3498dae8cd7832398cd9e2a038 /generic/tkRectOval.c
parent	c735992f7daa038e0b63cd4070133a0986c50d3e (diff)
download	tk-4bb5c7bd2b86a922be6f8106241dde924dd16c53.zip tk-4bb5c7bd2b86a922be6f8106241dde924dd16c53.tar.gz tk-4bb5c7bd2b86a922be6f8106241dde924dd16c53.tar.bz2

Add SPI_SETKEYBOARDCUES definition,

needed for original VC++ 6.0

Diffstat (limited to 'generic/tkRectOval.c')

0 files changed, 0 insertions, 0 deletions

@ -1069,6 +1087,7 @@ void QDeclarativeTextEditPrivate::init()

QObject::connect(control, SIGNAL(selectionChanged()), q, SLOT(updateSelectionMarkers()));

QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(updateSelectionMarkers()));

QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));

+ QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorRectangleChanged()));

document = control->document();

document->setDefaultFont(font);

@@ -1141,18 +1160,20 @@ void QDeclarativeTextEdit::updateSize()

d->document->setTextWidth(width());

dy -= (int)d->document->size().height();

- int yoff = 0;

if (heightValid()) {

if (d->vAlign == AlignBottom)

- yoff = dy;

+ d->yoff = dy;

else if (d->vAlign == AlignVCenter)

- yoff = dy/2;

+ d->yoff = dy/2;

+ } else {

+ d->yoff = 0;

}

- setBaselineOffset(fm.ascent() + yoff + d->textMargin);

+ setBaselineOffset(fm.ascent() + d->yoff + d->textMargin);

//### need to comfirm cost of always setting these

int newWidth = qCeil(d->document->idealWidth());

- d->document->setTextWidth(newWidth); // ### QTextDoc> Alignment will not work unless textWidth is set. Does Text need this line as well?

+ if (!widthValid())

+ d->document->setTextWidth(newWidth); // ### Text does not align if width is not set (QTextDoc bug)

int cursorWidth = 1;

if(d->cursor)

cursorWidth = d->cursor->width();

@@ -1161,7 +1182,7 @@ void QDeclarativeTextEdit::updateSize()

newWidth += 3;// ### Need a better way of accounting for space between char and cursor

// ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.

setImplicitWidth(newWidth);

- setImplicitHeight(d->text.isEmpty() ? fm.height() : (int)d->document->size().height());

+ setImplicitHeight(d->document->isEmpty() ? fm.height() : (int)d->document->size().height());

setContentsSize(QSize(width(), height()));

} else {

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index 8848d47..891b868 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h

@@ -78,6 +78,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeTextEdit : public QDeclarativePaintedItem

Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged)

Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)

Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)

+ Q_PROPERTY(QRect cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)

Q_PROPERTY(QDeclarativeComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)

Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)

Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)

@@ -180,13 +181,14 @@ public:

void setTextInteractionFlags(Qt::TextInteractionFlags flags);

Qt::TextInteractionFlags textInteractionFlags() const;

- QRect cursorRect() const;

+ QRect cursorRectangle() const;

QVariant inputMethodQuery(Qt::InputMethodQuery property) const;

Q_SIGNALS:

void textChanged(const QString &);

void cursorPositionChanged();

+ void cursorRectangleChanged();

void selectionStartChanged();

void selectionEndChanged();

void selectionChanged();

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index 885620d..d96796c 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h

@@ -73,7 +73,8 @@ public:

persistentSelection(true), clickCausedFocus(false), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),

cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0),

wrapMode(QDeclarativeTextEdit::NoWrap),

- selectByMouse(false)

+ selectByMouse(false),

+ yoff(0)

{

}

@@ -112,6 +113,7 @@ public:

QTextControl *control;

QDeclarativeTextEdit::WrapMode wrapMode;

bool selectByMouse;

+ int yoff;

};

QT_END_NAMESPACE

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 2e7715f..1ac1b4e 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp

@@ -54,8 +54,9 @@ QT_BEGIN_NAMESPACE

/*!

\qmlclass TextInput QDeclarativeTextInput

- \since 4.7

+ \since 4.7

\brief The TextInput item allows you to add an editable line of text to a scene.

+ \inherits Item

TextInput can only display a single line of text, and can only display

plain text. However it can provide addition input constraints on the text.

@@ -1120,7 +1121,7 @@ QString QDeclarativeTextInput::displayText() const

}

/*!

- \qmlproperty string TextInput::selectByMouse

+ \qmlproperty bool TextInput::selectByMouse

Defaults to false.

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 8230941..882e981 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp

@@ -191,7 +191,9 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)

data->error.setUrl(url);

data->error.setLine(line);

data->error.setColumn(-1);

- data->error.setDescription(QLatin1String("Unable to assign [undefined] to ") + QLatin1String(QMetaType::typeName(data->property.propertyType())));

+ data->error.setDescription(QLatin1String("Unable to assign [undefined] to ")

+ + QLatin1String(QMetaType::typeName(data->property.propertyType()))

+ + QLatin1String(" ") + data->property.name());

} else if (!scriptValue.isRegExp() && scriptValue.isFunction()) {

@@ -353,8 +355,6 @@ void QDeclarativeAbstractBinding::removeFromObject()

if (m_prevBinding) {

int index = propertyIndex();

- Q_ASSERT(m_object);

*m_prevBinding = m_nextBinding;

if (m_nextBinding) m_nextBinding->m_prevBinding = m_prevBinding;

m_prevBinding = 0;

@@ -363,7 +363,7 @@ void QDeclarativeAbstractBinding::removeFromObject()

if (index & 0xFF000000) {

// Value type - we don't remove the proxy from the object. It will sit their happily

// doing nothing for ever more.

- } else {

+ } else if (m_object) {

QDeclarativeData *data = QDeclarativeData::get(m_object, false);

if (data) data->clearBindingBit(index);

}

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index b5bf972..d27aced 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp

@@ -1089,6 +1089,23 @@ void QDeclarativeCompiler::genObjectBody(QDeclarativeParser::Object *obj)

fetch.line = prop->location.start.line;

output->bytecode << fetch;

+ if (!prop->value->metadata.isEmpty()) {

+ QDeclarativeInstruction meta;

+ meta.type = QDeclarativeInstruction::StoreMetaObject;

+ meta.line = 0;

+ meta.storeMeta.data = output->indexForByteArray(prop->value->metadata);

+ meta.storeMeta.aliasData = output->indexForByteArray(prop->value->synthdata);

+ meta.storeMeta.propertyCache = output->propertyCaches.count();

+ // ### Surely the creation of this property cache could be more efficient

+ QDeclarativePropertyCache *propertyCache =

+ enginePrivate->cache(prop->value->metaObject()->superClass())->copy();

+ propertyCache->append(engine, prop->value->metaObject(), QDeclarativePropertyCache::Data::NoFlags,

+ QDeclarativePropertyCache::Data::IsVMEFunction);

+ output->propertyCaches << propertyCache;

+ output->bytecode << meta;

+ }

genObjectBody(prop->value);

QDeclarativeInstruction pop;

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3b782e7..7aa17e8 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp

@@ -549,15 +549,19 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q

Returns an object instance from this component, or null if object creation fails.

The object will be created in the same context as the one in which the component

- was created.

+ was created. This function will always return null when called on components

+ which were not created in QML.

Note that if the returned object is to be displayed, its \c parent must be set to

- an existing item in a scene, or else the object will not be visible.

+ an existing item in a scene, or else the object will not be visible. The parent

+ argument is required to help you avoid this, you must explicitly pass in null if

+ you wish to create an object without setting a parent.

/*!

\internal

- A version of create which returns a scriptObject, for use in script

+ A version of create which returns a scriptObject, for use in script.

+ This function will only work on components created in QML.

Sets graphics object parent because forgetting to do this is a frequent

and serious problem.

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp


context:
space:
mode: