potential fix to mouse disappearing act

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1028 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-06-12 03:12:01 +00:00
parent fa2b94254e
commit d1c73b5f78
5 changed files with 30 additions and 28 deletions

View File

@ -10,16 +10,16 @@
<projectname>projectMTrunk</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description></description>
<defaultencoding></defaultencoding>
<description/>
<defaultencoding/>
<versioncontrol/>
</general>
<kdevcustomproject>
<run>
<directoryradio>executable</directoryradio>
<mainprogram>/home/carm/projects/projectM/trunk/src/projectM-pulseaudio/projectM-pulseaudio</mainprogram>
<programargs></programargs>
<globaldebugarguments></globaldebugarguments>
<programargs/>
<globaldebugarguments/>
<globalcwd>/home/carm/projects/projectM/trunk/src/</globalcwd>
<useglobalprogram>false</useglobalprogram>
<terminal>false</terminal>
@ -51,9 +51,9 @@
</build>
<other>
<prio>0</prio>
<otherbin></otherbin>
<defaulttarget></defaulttarget>
<otheroptions></otheroptions>
<otherbin/>
<defaulttarget/>
<otheroptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@ -64,9 +64,9 @@
<numberofjobs>2</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
<makebin></makebin>
<defaulttarget></defaulttarget>
<makeoptions></makeoptions>
<makebin/>
<defaulttarget/>
<makeoptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@ -75,11 +75,11 @@
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell></dbgshell>
<gdbpath></gdbpath>
<configGdbScript></configGdbScript>
<runShellScript></runShellScript>
<runGdbScript></runGdbScript>
<dbgshell/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@ -180,7 +180,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
<prefixGet></prefixGet>
<prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>

Binary file not shown.

View File

@ -2,23 +2,23 @@
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="6" >
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.hpp" >
<Doc0 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/presets/Aderrasi%20-%20Airs%20(Windy%20Mix).milk" >
<View0 Encoding="" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qplaylistmodel.cpp" >
<Doc1 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.cpp" >
<View0 Encoding="" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/projectM.cpp" >
<Doc2 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/Renderer.cpp" >
<View0 Encoding="" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/moc_qprojectm_mainwindow.cxx" >
<Doc3 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp" >
<View0 Encoding="" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/KeyHandler.cpp" >
<Doc4 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qprojectmwidget.hpp" >
<View0 Encoding="" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-engine/PresetChooser.hpp" >
<View0 Encoding="" line="115" Type="Source" />
<Doc5 NumberOfViews="1" URL="file:///home/carm/projects/projectM/trunk/src/projectM-qt/qprojectm_mainwindow.cpp" >
<View0 Encoding="" line="270" Type="Source" />
</Doc5>
</DocsAndViews>
<pluginList>
@ -56,7 +56,7 @@
</bookmarks>
</kdevbookmarks>
<kdevvalgrind>
<executable path="/home/carm/projects/projectM/trunk/src/projectM-pulseaudio/projectM-pulseaudio" params="" />
<executable path="" params="" />
<valgrind path="/usr/bin/valgrind" params=" --tool=memcheck --leak-check=yes" />
<calltree path="/usr/bin/valgrind" params="--tool=callgrind" />
<kcachegrind path="/usr/kde/3.5/bin/kcachegrind" />

View File

@ -66,7 +66,6 @@ class PlaylistWriteFunctor {
const QString & m_desc;
};
QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file, QMutex * audioMutex)

View File

@ -22,8 +22,7 @@ class QProjectMWidget : public QGLWidget {
m_mouseTimer->start(MOUSE_VISIBLE_TIMEOUT_MS);
connect(m_mouseTimer, SIGNAL(timeout()), this, SLOT(hideMouse()));
this->setMouseTracking(true);
@ -57,7 +56,6 @@ class QProjectMWidget : public QGLWidget {
m_presetSeizeMutex.unlock();
}
inline QProjectM * qprojectM() { return m_projectM; }
@ -70,6 +68,11 @@ class QProjectMWidget : public QGLWidget {
}
inline void leaveEvent ( QEvent * event ) {
/// @bug testing if this resolves a bug for ubuntu users
QApplication::restoreOverrideCursor();
}
public slots:
void resetProjectM() {