File tree Expand file tree Collapse file tree 4 files changed +156
-73
lines changed Expand file tree Collapse file tree 4 files changed +156
-73
lines changed Original file line number Diff line number Diff line change @@ -1187,21 +1187,22 @@ class InterSpec : public Wt::WContainerWidget
11871187 AuxWindow *m_warningsWindow;
11881188
11891189 SpecMeasManager *m_fileManager; // The file manager
1190- Wt::WGridLayout *m_layout;
1191-
1192- // 20210604: started playing around with using FLEX layout for just the charts - its not there yet,
1193- // but shows some promise.
1194- #define USE_FLEX_CHART_LAYOUT 0
1190+
1191+ // 20210604: started playing around with using FLEX layout for just the charts - its not there yet,
1192+ // but shows some promise.
1193+ #define USE_CSS_FLEX_LAYOUT 1
11951194
11961195 // Note: m_chartsLayout may be eliminated; may even be able to eliminate
11971196 // m_toolsLayout...
1198- #if ( USE_FLEX_CHART_LAYOUT )
1199- Wt::WContainerWidget *m_chartsDiv;
1197+ #if ( USE_CSS_FLEX_LAYOUT )
1198+ Wt::WContainerWidget *m_chartResizer;
1199+ Wt::WContainerWidget *m_toolsResizer;
12001200#else
1201+ Wt::WGridLayout *m_layout;
12011202 Wt::WGridLayout *m_chartsLayout;
1203+ Wt::WGridLayout *m_toolsLayout;
12021204#endif
12031205
1204- Wt::WGridLayout *m_toolsLayout;
12051206 Wt::WContainerWidget *m_menuDiv; // The top menu bar.
12061207
12071208 // m_peakInfoWindow is deleted when tool tabs are shown because the layout
Original file line number Diff line number Diff line change @@ -1376,3 +1376,21 @@ body.Wt-rtl .Wt-tabs a {
13761376.Wt-tabs : after { content : "" ; display : block; height : 0 ; clear : both; }
13771377.Wt-tabs { clear-after : both; }
13781378
1379+
1380+ /* The entries from here below are only used when USE_CSS_FLEX_LAYOUT is tru in the C++ (experimental at the moment) */
1381+ .InterSpecFlex {
1382+ display : flex;
1383+ flex-direction : column;
1384+ flex-wrap : nowrap;
1385+ }
1386+
1387+ .InterSpecFlex .SpectrumDisplayDiv {
1388+ flex-grow : 3 ;
1389+ overflow : hidden;
1390+ }
1391+
1392+ .InterSpecFlex .D3TimeChartParent {
1393+ flex-grow : 2 ;
1394+ overflow : hidden;
1395+ }
1396+
Original file line number Diff line number Diff line change @@ -300,7 +300,7 @@ void D3SpectrumDisplayDiv::defineJavaScript()
300300 setJavaScriptMember ( " chart" , " new SpectrumChartD3(" + jsRef () + " ," + options + " );" );
301301
302302
303- #if ( USE_FLEX_CHART_LAYOUT )
303+ #if ( USE_CSS_FLEX_LAYOUT )
304304 doJavaScript ( " "
305305 " const resizeObs" + id () + " = new ResizeObserver(entries => {"
306306 " for (let entry of entries) {"
You can’t perform that action at this time.
0 commit comments