Changeset 1311

Timestamp:

11/11/07 13:24:31 (11 months ago)

Author:

calvin

Message:

revert a tiny workaround in DockTabPane?.h from earlier that didnt do anything anyway and fix the real issue why the sequencer cursor sometimes was messed up. property view handles mouse activation better. sequencer tracks are automatically added for new no-input-no-output-machines (such as miditracker)

Location:

trunk/src/buzelib

Files:

• DockTabFrame/DockTabPane.h (modified) (1 diff)
• EditorActions.cpp (modified) (1 diff)
• PropertyListView.cpp (modified) (1 diff)
• SequenceEditor.cpp (modified) (4 diffs)
• SequenceEditor.h (modified) (1 diff)

trunk/src/buzelib/DockTabFrame/DockTabPane.h

@@ -532 +532 @@
                                 CWindow win( clientViewWnd);
                                 win.SetWindowPos( HWND_TOP, clientRect, SWP_SHOWWINDOW);
-                                win.SetFocus(); // added by anders, need OnFocus for carets
                                 return true;
                         }

trunk/src/buzelib/EditorActions.cpp

@@ -415 +415 @@
                 // NOTE: still only creating sequencer tracks for generators
 
-                if ((machine->getFlags() & PLUGIN_FLAGS_MASK) == GENERATOR_PLUGIN_FLAGS) {
+                bool isGenerator = (machine->getFlags() & PLUGIN_FLAGS_MASK) == GENERATOR_PLUGIN_FLAGS;
+                bool isNoInputOutput = ((machine->getFlags() & zzub_plugin_flag_has_audio_input) == 0) && ((machine->getFlags() & zzub_plugin_flag_has_audio_output) == 0);
+
+                if (isGenerator || isNoInputOutput) {
                         document->player->lockTick();
                         sequence* track = new sequence(machine);

trunk/src/buzelib/PropertyListView.cpp

@@ -160 +160 @@
                 
 LRESULT CPropertyListView::OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-        return MA_ACTIVATE;
+        // we need to process WM_MOUSEACTIVATE before the docktabframework as it sets focus causing 
+        // several problems with our property list.
+        if (mainFrame->frame.focusedClientView() == *this) {
+                return MA_ACTIVATE;
+        } else
+                return DefWindowProc();
 }

trunk/src/buzelib/SequenceEditor.cpp

@@ -788 +788 @@
         Invalidate(erase?TRUE:FALSE);
         UpdateWindow();
-        showCaret();
+        updateCaretPosition();
 
         paintMode=SequenceViewAll;
@@ -801 +801 @@
 void CSequenceEditor::createCaret() {
         CreateSolidCaret(cellWidth-1, 16);
-    showCaret();
+    caretCreated = true;
+    updateCaretPosition();
         ShowCaret();
-    caretCreated = true;
 }
 
@@ -816 +816 @@
         if (!caretCreated) 
             createCaret(); else
-            showCaret();
+            updateCaretPosition();
     }
 }
@@ -836 +836 @@
 }
 
-void CSequenceEditor::showCaret() {
+void CSequenceEditor::updateCaretPosition() {
         if (mainFrame->player->getSequenceTracks()==0) return ;
-
-    if (mainFrame->frame.focusedClientView() != sequenceView->m_hWnd) return ;
+        if (GetFocus() != m_hWnd) return ;
 
     // validate cursor position

trunk/src/buzelib/SequenceEditor.h

@@ -43 +43 @@
         void destroyCaret();
         void createCaret();
-        void showCaret();
+        void updateCaretPosition();
 
         int getRowsToRender();