Changeset 1341

Timestamp:

01/09/08 14:34:37 (8 months ago)

Author:

calvin

Message:

paramview opens faster

Location:

trunk/src/buzelib

Files:

• MachineParameterView.cpp (modified) (8 diffs)
• MachineParameterView.h (modified) (6 diffs)
• MainFrm.cpp (modified) (4 diffs)
• ParameterController.cpp (modified) (1 diff)
• ParameterSliderCtrl.cpp (modified) (3 diffs)
• Utils/ToolbarWindow.h (modified) (1 diff)

trunk/src/buzelib/MachineParameterView.cpp

@@ -60 +60 @@
 }
 
+LRESULT CMachineParameterView::OnPostCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+        bindMachine();
+        //sliderView.ShowWindow(SW_SHOW);
+        return 0;
+}
+
 LRESULT CMachineParameterView::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
         LRESULT lres = DefWindowProc();
@@ -75 +81 @@
 
         sliderView.Create(m_hWnd, rcDefault, 0, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VSCROLL);
-        bindMachine();
 
         machine->addEventHandler(this);
@@ -433 +438 @@
         }
         return 0;
+}
+
+LRESULT CMachineParameterView::OnEraseBkgnd(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
+        return 1;
 }
 
@@ -604 +613 @@
 }
 
+void CMachineParameterScrollView::updateScrollbars() {
+        RECT rcClient;
+        GetClientRect(&rcClient);
+        int height = rcClient.bottom;
+
+        int prevScroll = GetScrollPos(SB_VERT);
+        int slidersPerPage = height / CParameterSliderCtrl::sliderHeight;
+        int totalSliderHeight = (sliders.size()) * CParameterSliderCtrl::sliderHeight;
+        if (totalSliderHeight < 0 || height == 0) totalSliderHeight = 0;
+
+        SCROLLINFO si;
+        si.cbSize = sizeof(SCROLLINFO);
+        si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
+        si.nPage = height;
+        si.nMin = 0;
+        si.nMax = totalSliderHeight;
+        si.nPos = prevScroll;
+        SetScrollInfo(SB_VERT, &si);
+        ScrollWindow(0, -prevScroll);
+}
+
 void CMachineParameterScrollView::setMachine(metaplugin* machine) {
         this->machine=machine;
@@ -647 +677 @@
         }
 
+        RECT rcClient;
+        GetClientRect(&rcClient);
+
         sliders.resize(numSliders);
-        size_t sliderIndex=0;
+        size_t sliderIndex = 0;
         for (size_t i = 0; i < conv.getColumns(); i++) {
                 const parameter* param = conv.getColumnParameter(i);
@@ -666 +699 @@
 
                 if (sliderIndex >= oldslidercount) {
-                        sliders[sliderIndex]=new CParameterSliderCtrl(mainFrame);
-                        sliders[sliderIndex]->Create(m_hWnd, rcDefault, "", WS_CHILD|WS_VISIBLE);
+                        sliders[sliderIndex] = new CParameterSliderCtrl(mainFrame);
+                        RECT rcSlider = { 0, sliderIndex*CParameterSliderCtrl::sliderHeight, rcClient.right, sliderIndex*CParameterSliderCtrl::sliderHeight + CParameterSliderCtrl::sliderHeight };
+                        sliders[sliderIndex]->Create(m_hWnd, rcSlider, "", WS_CHILD|WS_VISIBLE);
                 }
                 sliders[sliderIndex]->setParameter(machine, pgroup, ptrack, pcolumn);
@@ -673 +707 @@
         }
 
-        RECT rc;
-        GetClientRect(&rc);
-        BOOL b;
-        OnSize(0,0,MAKEWPARAM(rc.right, rc.bottom), b);
+        updateScrollbars();
 }
 
 LRESULT CMachineParameterScrollView::OnSize(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
-        int width=LOWORD(lParam), height=HIWORD(lParam);
-        
-        int prevScroll = GetScrollPos(SB_VERT);
+        int width = LOWORD(lParam);
 
         for (size_t i=0; i<sliders.size(); i++) {
@@ -688 +717 @@
         }
 
-        int slidersPerPage=height/CParameterSliderCtrl::sliderHeight;
-
-        int totalSliderHeight=(sliders.size())*CParameterSliderCtrl::sliderHeight;
-        if (totalSliderHeight<0) 
-                totalSliderHeight=0;
-
-        this->SetScrollRange(SB_VERT, 0, totalSliderHeight-1);
-
-        if (totalSliderHeight>0) {
-                SCROLLINFO si;
-                si.cbSize=sizeof(SCROLLINFO);
-                si.fMask=SIF_PAGE;
-                si.nPage=height;
-                this->SetScrollInfo(SB_VERT, &si);
-        }
-
-        SetScrollPos(SB_VERT, prevScroll);
-        ScrollWindow(0, -prevScroll);
+        updateScrollbars();
 
         return 0;

trunk/src/buzelib/MachineParameterView.h

@@ -12 +12 @@
 class CMachineParameterView;
 class ClientViewListener;
+
+const int WM_POSTCREATE = WM_USER + 1;
 
 class CMachineParameterScrollView : public CWindowImpl<CMachineParameterScrollView> {
@@ -44 +46 @@
 
         void scrollToView(int slider);
+        void updateScrollbars();
 };
 
@@ -72 +75 @@
                 CHAIN_MSG_MAP(CToolbarWindow<CMachineParameterView>)
                 MESSAGE_HANDLER(WM_CREATE, OnCreate)
+                MESSAGE_HANDLER(WM_POSTCREATE, OnPostCreate)
                 MESSAGE_HANDLER(WM_CHAR, OnChar)
                 MESSAGE_HANDLER(WM_SIZE, OnSize)
@@ -77 +81 @@
                 MESSAGE_HANDLER(WM_KEYUP, OnKeyUp)
                 MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel)
+                MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd)
 
                 MESSAGE_HANDLER(WM_CLOSE, OnClose)
@@ -112 +117 @@
         LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+        LRESULT OnPostCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnChar(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
@@ -117 +123 @@
         LRESULT OnKeyUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
         LRESULT OnMouseWheel(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+        LRESULT OnEraseBkgnd(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/);
 
         LRESULT OnHelp(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);

trunk/src/buzelib/MainFrm.cpp

@@ -236 +236 @@
         , playPatternSequencer()
         , undoManager(this)*/
-        , machineParameters(this, DockSplitTab::placeDOCKPANE, DockSplitTab::dockRIGHT, "Parameters", "Machine Parameters", true)
+        , machineParameters(this, DockSplitTab::placeFLOATFRAME, DockSplitTab::dockUNKNOWN, "Parameters", "Machine Parameters", true)
         , patternEditors(this, DockSplitTab::placeMAINPANE, DockSplitTab::dockUNKNOWN, "Pattern", "Pattern", false)
         , inputMixers(this, DockSplitTab::placeDOCKPANE, DockSplitTab::dockBOTTOM, "Input Mixer", "Input Mixer", true)
@@ -1265 +1265 @@
 
         ::ShowWindow(m_hWndStatusBar, getToolbarVisibility(ID_VIEW_STATUS_BAR) ? SW_SHOWNOACTIVATE : SW_HIDE);
+        setToolbarVisibility(ID_VIEW_STATUS_BAR, getToolbarVisibility(ID_VIEW_STATUS_BAR));
 
         setMainFrameToolbarVisibility(1, ID_VIEW_TOOLBAR, getToolbarVisibility(ID_VIEW_TOOLBAR), FALSE, FALSE);
@@ -1932 +1933 @@
         RECT* rcCreate = 0;
 
-        FramePlace place = machineParameters.framePlace;
-        DockSide side = machineParameters.dockSide;
-
-        if (configPopup) {
-                int views = (machineParameters.getViews() % 16);
-
-                int params = 0;
-                pattern conv(m, 0);
-                for (size_t i = 0; i < conv.getColumns(); i++) {
-                        const parameter* param = conv.getColumnParameter(i);
-                        if ((param->flags & zzub::parameter_flag_state) == 0) continue;
-                        size_t g = 0, t = 0, c = 0;
-                        conv.linearToPattern(i, g, t, c);
-                        if (g == 0) {
-                                zzub::connection* conn = m->getConnection(t);
-                                if (conn->plugin_in->nonSongPlugin) continue;
-                        }
-                        params++;
+        int views = (machineParameters.getViews() % 16);
+
+        int params = 0;
+        pattern conv(m, 0);
+        for (size_t i = 0; i < conv.getColumns(); i++) {
+                const parameter* param = conv.getColumnParameter(i);
+                if ((param->flags & zzub::parameter_flag_state) == 0) continue;
+                size_t g = 0, t = 0, c = 0;
+                conv.linearToPattern(i, g, t, c);
+                if (g == 0) {
+                        zzub::connection* conn = m->getConnection(t);
+                        if (conn->plugin_in->nonSongPlugin) continue;
                 }
-                int parameterHeight = params*CParameterSliderCtrl::sliderHeight + 20;   // 22 = toolbarheight
-
-                POINT pt;
-                GetCursorPos(&pt);
-                rcTarget.left = pt.x;
-                rcTarget.top = pt.y;
-                rcTarget.right = rcTarget.left + 400;
-                rcTarget.bottom = rcTarget.top + parameterHeight;
-
-                rcCreate = &rcTarget;
-
-                place = placeFLOATFRAME;
-                side = dockUNKNOWN;
-        }
-
+                params++;
+        }
+        int parameterHeight = params*CParameterSliderCtrl::sliderHeight + 24;   // 24 = toolbarheight
+
+        POINT pt;
+        GetCursorPos(&pt);
+        rcTarget.left = pt.x;
+        rcTarget.top = pt.y;
+        rcTarget.right = rcTarget.left + 400;
+        rcTarget.bottom = rcTarget.top + parameterHeight;
+
+        rcCreate = &rcTarget;
+
+        CMachineParameterView* mpv;
         for (unsigned i = 0; i<machineParameters.getViews(); i++) {
-                CMachineParameterView* mpv = machineParameters.getView(i);
+                mpv = machineParameters.getView(i);
                 if (mpv->getMachine() == m) {
                         frame.setFocusTo(*mpv);
@@ -1976 +1970 @@
         createMachineParameterViewPlugin = m;
         ClientView* cv = machineParameters.createClientWindow(m_hWnd, label);
-        machineParameters.insertClient(cv, rcCreate, place, side);
+        machineParameters.insertClient(cv, rcCreate);//, place, side);
+
+        mpv = machineParameters.lookupView(cv);
+        mpv->PostMessage(WM_POSTCREATE);
 
 }

trunk/src/buzelib/ParameterController.cpp

@@ -90 +90 @@
 
 LRESULT CParameterController::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
-        LRESULT lres=DefWindowProc();
-        m_slider.Create(*this, rcDefault, 0, WS_TABSTOP|WS_VISIBLE|WS_CHILD|PSBS_NOTIFY);
+        LRESULT lres = DefWindowProc();
+        RECT rcClient;
+        GetClientRect(&rcClient);
+        m_slider.Create(m_hWnd, rcClient, 0, WS_TABSTOP|WS_VISIBLE|WS_CHILD|PSBS_NOTIFY);
         return 0;
 }
 
 LRESULT CParameterController::OnSize(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
-        RECT rc;
-        GetClientRect(&rc);
-
-        m_slider.MoveWindow(0,0, rc.right, rc.bottom);
+        RECT rcClient;
+        GetClientRect(&rcClient);
+
+        m_slider.MoveWindow(0, 0, rcClient.right, rcClient.bottom);
         return 0;
 }

trunk/src/buzelib/ParameterSliderCtrl.cpp

@@ -14 +14 @@
 using namespace zzub;
 
+
+namespace {
+        const int labelWidth = 100;
+        const int valueWidth = 80;
+}
+
+
 /***
 
@@ -29 +36 @@
 
 LRESULT CParameterSliderCtrl::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-        label.Create(m_hWnd, rcDefault, "Parameter Name", WS_CHILD|WS_VISIBLE);
-//      trackBar.sliderCtrl=this;
-        trackBar.Create(m_hWnd, rcDefault, 0, WS_CHILD|WS_VISIBLE|TBS_NOTICKS|TBS_BOTH );
-        valueLabel.Create(m_hWnd, rcDefault, "Value", WS_CHILD|WS_VISIBLE|SS_ENDELLIPSIS|SS_WORDELLIPSIS);
+
+        RECT rcClient;
+        GetClientRect(&rcClient);
+
+        int sliderWidth = rcClient.right - labelWidth - valueWidth;
+
+        label.Create(m_hWnd, CRect(0, 0, labelWidth, sliderHeight), "Parameter Name", WS_CHILD|WS_VISIBLE);
+        trackBar.Create(m_hWnd, CRect(0+labelWidth, 0, sliderWidth, sliderHeight), 0, WS_CHILD|WS_VISIBLE|TBS_NOTICKS|TBS_BOTH );
+        valueLabel.Create(m_hWnd, CRect(0+labelWidth+sliderWidth, 0, valueWidth, sliderHeight), "Value", WS_CHILD|WS_VISIBLE|SS_ENDELLIPSIS|SS_WORDELLIPSIS);
 
         label.SetFont((HFONT)GetStockObject(DEFAULT_GUI_FONT));
@@ -44 +56 @@
         int width=LOWORD(lParam), height=HIWORD(lParam);
 
-        int labelWidth=100;
-        int valueWidth=80;
-        int sliderWidth=width-labelWidth-valueWidth;
+        int sliderWidth = width - labelWidth - valueWidth;
 
         label.MoveWindow(0, 0, labelWidth, sliderHeight);

trunk/src/buzelib/Utils/ToolbarWindow.h

@@ -11 +11 @@
         LRESULT OnRButtonDown(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled) {
                 ::SendMessage(GetParent(), WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos());
+                return 0;
         }
 };