Changeset 733 for trunk/src/mouse_down.m


Ignore:
Timestamp:
Apr 4, 2014, 1:31:34 PM (10 years ago)
Author:
sommeria
Message:

various improvements

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/mouse_down.m

    r714 r733  
    145145                output=msgbox_uvmat(['uicontrol: ' get(hchild,'Tag')],display_str,get(hchild,'String'),msg_pos);
    146146                %update the parent edit box and indicat that refresh is needed with the new input
    147                 if strcmp(get(hchild,'Style'),'edit')&&strcmp(get(hchild,'Enable'),'on')
     147                if ~strcmp(output,'Cancel') && strcmp(get(hchild,'Style'),'edit')&&strcmp(get(hchild,'Enable'),'on')
    148148                    set(hchild,'String',output)
    149149                    if strcmp(get(get(hchild,'parent'),'tag'),'InputFile')
     
    185185                        output=msgbox_uvmat(['uicontrol: ' get(hhchild,'Tag')],display_str,get(hhchild,'String'),msg_pos);
    186186                        %update the parent edit box and indicat that refresh is needed with the new input
    187                         if strcmp(get(hhchild,'Style'),'edit')&&strcmp(get(hhchild,'Enable'),'on')
     187                        if ~strcmp(output,'Cancel') && strcmp(get(hhchild,'Style'),'edit')&&strcmp(get(hhchild,'Enable'),'on')
    188188                            set(hhchild,'String',output)
    189189                            if strcmp(get(get(hhchild,'parent'),'tag'),'InputFile')
     
    229229    Left=GUI_pos(1)+GUI_pos(3)-Width; %right edge close to the right, with margin=40
    230230    Bottom=GUI_pos(2)+GUI_pos(4)-Height; %put fig at top right
    231    % hfig_text=figure('Name','text_display','MenuBar','none','NumberTitle','off','Position',[Left,Bottom,Width,Height]);
     231    hfig_text=figure('Name','text_display','MenuBar','none','NumberTitle','off','Position',[Left,Bottom,Width,Height]);
    232232    AxeData.htext_display=uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.05 0.9 0.9],'Max',2,'BackgroundColor',[1 1 1],...
    233233        'FontUnits','points','FontSize',14);
Note: See TracChangeset for help on using the changeset viewer.