Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
matlab-gui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dóra Kocsis
matlab-gui
Commits
b84ebb1d
Commit
b84ebb1d
authored
May 17, 2018
by
Houtan Bastani
Browse files
Options
Downloads
Patches
Plain Diff
update external file
parent
3abdc7aa
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
license.txt
+1
-1
1 addition, 1 deletion
license.txt
src/+gui_external/findjobj.m
+10
-3
10 additions, 3 deletions
src/+gui_external/findjobj.m
with
11 additions
and
4 deletions
license.txt
+
1
−
1
View file @
b84ebb1d
...
...
@@ -29,7 +29,7 @@ License: GPL-3+
along with the Dynare GUI. If not, see <http://www.gnu.org/licenses/>.
Files: src/+gui_external/*
Copyright: 2007-201
6
Yair Altman
Copyright: 2007-201
7
Yair Altman
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
...
...
This diff is collapsed.
Click to expand it.
src/+gui_external/findjobj.m
+
10
−
3
View file @
b84ebb1d
...
...
@@ -88,6 +88,7 @@ function [handles,levels,parentIdx,listing] = findjobj(container,varargin) %#ok<
% Please send to Yair Altman (altmany at gmail dot com)
%
% Change log:
% 2017-04-13: Fixed two edge-cases (one suggested by H. Koch)
% 2016-04-19: Fixed edge-cases in old Matlab release; slightly improved performance even further
% 2016-04-14: Improved performance for the most common use-case (single input/output): improved code + allow inspecting groot
% 2016-04-11: Improved performance for the most common use-case (single input/output)
...
...
@@ -144,7 +145,7 @@ function [handles,levels,parentIdx,listing] = findjobj(container,varargin) %#ok<
% referenced and attributed as such. The original author maintains the right to be solely associated with this work.
% Programmed and Copyright by Yair M. Altman: altmany(at)gmail.com
% $Revision: 1.
49
$ $Date: 201
6
/04/1
8
2
3
:4
4:49
$
% $Revision: 1.
50
$ $Date: 201
7
/04/1
3
2
0
:4
7:08
$
% Ensure Java AWT is enabled
error
(
javachk
(
'awt'
));
...
...
@@ -3377,7 +3378,13 @@ function jControl = findjobj_fast(hControl, jContainer)
oldWarn
=
warning
(
'off'
,
'MATLAB:HandleGraphics:ObsoletedProperty:JavaFrame'
);
if
nargin
<
2
||
isempty
(
jContainer
)
% Use a HG2 matlab.ui.container.Panel jContainer if the control's parent is a uipanel
try
hParent
=
get
(
hControl
,
'Parent'
);
catch
% Probably indicates an invalid/deleted/empty handle
jControl
=
[];
return
end
try
jContainer
=
hParent
.
JavaFrame
.
getGUIDEView
;
catch
,
jContainer
=
[];
end
end
if
isempty
(
jContainer
)
...
...
@@ -3401,6 +3408,7 @@ function jControl = findjobj_fast(hControl, jContainer)
end
function
jControl
=
findTooltipIn
(
jContainer
)
try
jControl
=
[];
% Fix suggested by H. Koch 11/4/2017
tooltipStr
=
jContainer
.
getToolTipText
;
%if strcmp(char(tooltipStr),'!@#$%^&*')
if
~
isempty
(
tooltipStr
)
&&
tooltipStr
.
startsWith
(
'!@#$%^&*'
)
% a bit faster
...
...
@@ -3413,7 +3421,6 @@ function jControl = findTooltipIn(jContainer)
end
catch
% ignore
jControl
=
[];
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment