Revision 3024

View differences:

trunk/libraries/libCorePlugin/src/com/iver/core/mdiManager/NewSkin.java
278 278
	 * @see com.iver.andami.ui.mdiManager.MDIManager#getActiveView()
279 279
	 */
280 280
	public View getActiveView() {
281
		/* JInternalFrame jif = panel.getSelectedFrame();
281
		JInternalFrame jif = panel.getSelectedFrame();
282 282

  
283 283
		if (jif != null) {
284
			return fvs.getView(jif);
285
		} */
286
        return vss.getActiveView();
284
            View theView = fvs.getView(jif);
285
            if (theView == null) return null;
286
            if (theView.getViewInfo().isPalette())
287
                return vss.getActiveView();
288
            else
289
                return fvs.getView(jif);
290
		} 
291
        // return vss.getActiveView();
287 292

  
288
		// return null;
293
		return null;
289 294
	}
290 295

  
291 296
	/**
......
524 529

  
525 530
			vss.remove(view);
526 531

  
527
            panel.repaint();
528 532
            
529
            if (vi.isPalette()) return;
530 533
            
531
			mainFrame.enableControls();
532

  
534
            if (!vi.isPalette())            
535
			    mainFrame.enableControls();
536
            panel.repaint();
533 537
			
534 538
            
535 539
            // Para activar el JInternalFrame desde la que hemos

Also available in: Unified diff