github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed full screen issue in SlideShow

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15002 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-09-09 11:58:47 +00:00
parent 7bec26bd36
commit 697362bca2
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CtrlCore/TopWin32.cpp
View file

@ -309,9 +309,15 @@ TopWindow& TopWindow::FullScreen(bool b)
fullscreen = b;
HWND hwnd = GetOwnerHWND();
bool pinloop = inloop;
bool open = IsOpen();
WndDestroy();
Overlap();
SetRect(overlapped); // 12-05-23 Tom changed from GetDefaultWindowRect() to 'overlapped' to restore back to previous window position
Rect r = GetRect();
if(open)
SetRect(overlapped); // restore to the same screen as before
else
if(r.left + r.top == 0)
SetRect(GetDefaultWindowRect()); // open in primary screen
Open(hwnd);
inloop = pinloop;
return *this;

1
uppsrc/Draw/ImageOp.cpp
View file

@ -446,7 +446,6 @@ Image Colorize(const Image& img, Color color, int alpha)
Image DarkTheme(const Image& img)
{
RTIMING("DarkTheme");
if(IsNull(img))
return img;

4
uppsrc/Esc/Esc.cpp
View file

@ -294,8 +294,6 @@ void Esc::Subscript(Esc::SRVal& r)
void Esc::Term(SRVal& r)
{
RTIMING("Term");
r.sbs = EscValue();
op_limit--;
@ -391,7 +389,6 @@ void Esc::Term(SRVal& r)
if(Char(':'))
_global = true;
if(IsId()) {
RTIMING("Id1");
String id = ReadId();
EscValue method;
int locali = var.Find(id);
@ -425,7 +422,6 @@ void Esc::Term(SRVal& r)
else
r.lval = &var.GetPut(id);
RTIMING("Id2");
try {
Subscript(r, _self, id);
}

3
uppsrc/ide/SlideShow.cpp
View file

@ -86,7 +86,6 @@ INITBLOCK {
SlideShow::SlideShow()
{
text.slideshow = settings.slideshow = this;
FullScreen();
Add(text.SizePos());
text.NoHyperlinkDecoration();
text.NoSb();
@ -266,6 +265,8 @@ void SlideShow::SetPage()
void TopicCtrl::SShow()
{
SlideShow ss;
ss.SetRect(GetScreenRect());
ss.FullScreen();
TopicLink tl = ParseTopicLink(GetCurrent());
if(IsNull(tl.package))
return;