Skip to content

[gui] Native GUI draws canvas without defaulting to web #23163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ThePhisch wants to merge 1 commit into from
Closed

[gui] Native GUI draws canvas without defaulting to web #23163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/gui/inc/TGuiFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class TGuiFactory : public TNamed {
virtual TApplicationImp *CreateApplicationImp(const char *classname, int *argc, char **argv);

virtual TCanvasImp *CreateCanvasImp(TCanvas *c, const char *title, UInt_t width, UInt_t height);
virtual TCanvasImp *CreateCanvasImpNative(TCanvas *c, const char *title, UInt_t width, UInt_t height);
virtual TCanvasImp *CreateCanvasImp(TCanvas *c, const char *title, Int_t x, Int_t y, UInt_t width, UInt_t height);

virtual TBrowserImp *CreateBrowserImp(TBrowser *b, const char *title, UInt_t width, UInt_t height, Option_t *opt="");
Expand Down
8 changes: 8 additions & 0 deletions core/gui/src/TGuiFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ TCanvasImp *TGuiFactory::CreateCanvasImp(TCanvas *c, const char *title, UInt_t w
return new TCanvasImp(c, title, width, height);
}

////////////////////////////////////////////////////////////////////////////////
/// Create a batch version of TCanvasImpNative, skipping the IsWebDisplay check.

TCanvasImp *TGuiFactory::CreateCanvasImpNative(TCanvas *c, const char *title, UInt_t width, UInt_t height)
{
return new TCanvasImp(c, title, width, height);
}

////////////////////////////////////////////////////////////////////////////////
/// Create a batch version of TCanvasImp.

Expand Down
2 changes: 1 addition & 1 deletion graf2d/gpad/src/TCanvas.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ TCanvas::TCanvas(const char *name, Int_t ww, Int_t wh, Int_t winid) : TPad(), fD
fUseGL = kFALSE;
}

fCanvasImp = gBatchGuiFactory->CreateCanvasImp(this, name, fCw, fCh);
fCanvasImp = gBatchGuiFactory->CreateCanvasImpNative(this, name, fCw, fCh);
if (!fCanvasImp) return;

CreatePainter();
Expand Down
Loading