LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3134 from Jojo-Schmitz/fix-windows-build

Browse source 
fix Windows build after 51372d8
This commit is contained in:
Nicolas Froment 2017-04-11 17:35:34 +02:00 committed by GitHub
commit 4d0b87c771
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmscore/text.cpp
View file

@ -1524,7 +1524,7 @@ void Text::startEdit(EditData& ed)
// endEdit
//---------------------------------------------------------
void Text::endEdit(EditData& ed)
void Text::endEdit(EditData&)
{
static const qreal w = 2.0;
score()->addRefresh(canvasBoundingRect().adjusted(-w, -w, w, w));
@ -2259,7 +2259,6 @@ QLineF Text::dragAnchor() const
void Text::paste(EditData& ed)
{
MuseScoreView* view = ed.view;
TextEditData* ted = static_cast<TextEditData*>(ed.getData(this));
TextCursor* _cursor = ted->cursor;
@ -2405,8 +2404,8 @@ bool Text::acceptDrop(EditData& data) const
Element* Text::drop(EditData& data)
{
Element* e = data.element;
#if 0
Element* e = data.element;
switch(e->type()) {
case ElementType::SYMBOL:
{

2
mscore/keyb.cpp
View file

@ -218,7 +218,7 @@ void ScoreView::editKey(QKeyEvent* ev)
#ifdef Q_OS_WIN // Japenese IME on Windows needs to know when Contrl/Alt/Shift/CapsLock is pressed while in predit
if (editElement->isText()) {
Text* text = toText(editElement);
if (text->cursor()->format()->preedit() && QGuiApplication::inputMethod()->locale().script() == QLocale::JapaneseScript &&
if (text->cursor(editData)->format()->preedit() && QGuiApplication::inputMethod()->locale().script() == QLocale::JapaneseScript &&
((editData.key == Qt::Key_Control || (editData.modifiers & Qt::ControlModifier)) ||
(editData.key == Qt::Key_Alt || (editData.modifiers & Qt::AltModifier)) ||
(editData.key == Qt::Key_Shift || (editData.modifiers & Qt::ShiftModifier)) ||