Revision 10689 trunk/libraries/libCorePlugin/src/com/iver/core/mdiManager/NewSkin.java

View differences:

NewSkin.java
55 55
import java.awt.event.WindowEvent;
56 56
import java.beans.PropertyVetoException;
57 57
import java.util.ArrayList;
58
import java.util.HashMap;
58 59
import java.util.Iterator;
59 60
import java.util.TreeMap;
60 61

  
......
717 718
                }
718 719
            }
719 720
            mainFrame.enableControls();
720
            if (wi.getSelectedTools() != null)
721
                mainFrame.setSelectedTools(wi.getSelectedTools());
721
            if (wi.getSelectedTools()==null) {
722
            	// this is the first time this window is activated
723
            	wi.setSelectedTools(new HashMap(mainFrame.getInitialSelectedTools()));
724
            }
725
            mainFrame.setSelectedTools(wi.getSelectedTools());
722 726
            callWindowActivated(panel);
723 727

  
724 728
        }
......
787 791
                WindowInfo wi = wis.getWindowInfo(win);
788 792
                if (wi.isPalette())
789 793
                    return;
790
                wi.setSelectedTools(mainFrame.getSelectedTool());
794

  
791 795
            }
792 796

  
793 797
        }

Also available in: Unified diff