← Back to branch summary

~tapaal-developers/tapaal/1.3

« back to all changes in this revision

Viewing changes to pipe/gui/GuiFrame.java

  • Committer: Kenneth Yrke Jørgensen
  • Date: 2010-05-07 21:10:59 UTC
  • Revision ID: kyrke@elia-20100507211059-elawo8xs2s159s9h
Fixed problem with toolbar not filling screen, by adding a borderlayout

Show diffs side-by-side

added added

removed removed

Lines of Context:
pipe/gui/GuiFrame.java
561
561
                toolBar.add(zoomInAction);
562
562
                
563
563
                //Modes
564
 
                toolBar.addSeparator();
565
564
                toolBar.add(toggleGrid);
566
565
                toolBar.add(new ToggleButton(dragAction));
567
566
                toolBar.add(new ToggleButton(startAction));
568
567
 
569
568
                //Start drawingToolBar
570
 
                toolBar.addSeparator();
571
569
                drawingToolBar = new JToolBar();
572
570
                drawingToolBar.setFloatable(false);
 
571
                drawingToolBar.addSeparator();
573
572
 
574
573
                //Normal arraw
575
574
                drawingToolBar.add(new ToggleButton(selectAction));
586
585
                drawingToolBar.addSeparator();
587
586
                drawingToolBar.add(tokenAction);
588
587
                drawingToolBar.add(deleteTokenAction);
589
 
 
590
 
                //Add drawingtoolbar to toolbar
591
 
                drawingToolBar.addSeparator();
592
 
                //toolBar.add(drawingToolBar);
593
 
                
594
 
                
 
588
                
 
589
                //Create panel to put toolbars in
595
590
                Panel toolBarPanel = new Panel();
596
591
                toolBarPanel.setLayout(new FlowLayout(0,0,0));
597
592
 
 
593
                //Add toolbars to pane
598
594
                toolBarPanel.add(toolBar);
599
595
                toolBarPanel.add(drawingToolBar);
600
 
                toolBarPanel.add(Box.createHorizontalGlue());
601
596
                        
602
 
                getContentPane().add(toolBarPanel,BorderLayout.PAGE_START);
 
597
                //Create a toolBarPaneltmp usign broderlayout and a spacer to get toolbar to fill
 
598
                // the screen
 
599
                Panel toolBarPaneltmp = new Panel();
 
600
                toolBarPaneltmp.setLayout(new BorderLayout());
 
601
                toolBarPaneltmp.add(toolBarPanel, BorderLayout.WEST);
 
602
                JToolBar spacer = new JToolBar();
 
603
                spacer.addSeparator();
 
604
                spacer.setFloatable(false);
 
605
                toolBarPaneltmp.add(spacer, BorderLayout.CENTER);
 
606
                
 
607
                //Add to GUI
 
608
                getContentPane().add(toolBarPaneltmp,BorderLayout.PAGE_START);
603
609
        }
604
610
 
605
611
        /**