Skip to content

Commit

Permalink
Merge pull request #7 from lastcode802/fix/fixed_action_button_style_…
Browse files Browse the repository at this point in the history
…issue_in_view

fixed action button style issue
  • Loading branch information
sharozraees802 committed Nov 7, 2022
2 parents a18f555 + c3e7c5c commit 55b1297
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 36 deletions.
9 changes: 8 additions & 1 deletion src/components/GlassArView/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,17 @@
.JeelizVTOWidgetControls {
/* position: absolute; */
z-index: 2;
width: 100%;
/* width: 100%; */
margin-left: 10px;
}
.JeelizVTOWidgetButtonContainer {
display: flex;
width: 100%;
justify-content: center;
align-items: center;
}
.JeelizVTOWidgetContainer {
width: 1000px;
}
.buttonIcon {
display: inline-block;
Expand Down
72 changes: 37 additions & 35 deletions src/components/GlassArView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,45 +114,47 @@ export function GlassArView(this: any, props: GlassArViewProps) {
} = props;

return (
<div ref={refPlaceHolder} className='JeelizVTOWidget' style={{ height: isheight, width: iswidth }}>
<canvas ref={refCanvas} className='JeelizVTOWidgetCanvas'></canvas>
<div className='JeelizVTOWidgetButtonContainer'>
{
adjustMode && (
<div className='JeelizVTOWidgetAdjustNoticeContainer' >
<div className='JeelizVTOWidgetAdjustNotice'>
Move the glasses to adjust them.
<div className='JeelizVTOWidgetContainer' >
<div ref={refPlaceHolder} className='JeelizVTOWidget' style={{ height: isheight, width: iswidth }}>
<canvas ref={refCanvas} className='JeelizVTOWidgetCanvas'></canvas>
<div className='JeelizVTOWidgetButtonContainer'>
{
adjustMode && (
<div className='JeelizVTOWidgetAdjustNoticeContainer' >
<div className='JeelizVTOWidgetAdjustNotice'>
Move the glasses to adjust them.
</div>
<div className='JeelizVTOWidgetControls'>
<ControlButton color={buttonFontColor} backgroundColor={buttonBackgroundColor} onClick={ExitadjustMode}>
Quit
</ControlButton>
</div>
</div>
<div className='JeelizVTOWidgetControls'>
<ControlButton color={buttonFontColor} backgroundColor={buttonBackgroundColor} onClick={ExitadjustMode}>
Quit
</ControlButton>
</div>
</div>
)
}
{
!adjustMode && (
<>
<div className='JeelizVTOWidgetControls'>
<ControlButton color={buttonFontColor} backgroundColor={buttonBackgroundColor} onClick={StartadjustMode}>
Adjust
</ControlButton>
</div>
<div className='JeelizVTOWidgetControls JeelizVTOWidgetChangeModelContainer'>
<ControlButton color={buttonFontColor} backgroundColor={buttonBackgroundColor} onClick={SetglassesModel.bind(this, ismodalName)}>Model </ControlButton>
</div>
</>
)
}
</div>
)
}
{
!adjustMode && (
<>
<div className='JeelizVTOWidgetControls'>
<ControlButton color={buttonFontColor} backgroundColor={buttonBackgroundColor} onClick={StartadjustMode}>
Adjust
</ControlButton>
</div>
<div className='JeelizVTOWidgetControls JeelizVTOWidgetChangeModelContainer'>
<ControlButton color={buttonFontColor} backgroundColor={buttonBackgroundColor} onClick={SetglassesModel.bind(this, ismodalName)}>Model </ControlButton>
</div>
</>
)
}
</div>

<div ref={refLoading} className='JeelizVTOWidgetLoading'>
<div className='JeelizVTOWidgetLoadingText'>
LOADING...
<div ref={refLoading} className='JeelizVTOWidgetLoading'>
<div className='JeelizVTOWidgetLoadingText'>
LOADING...
</div>
</div>
</div>

</div>
</div>
)
}
Expand Down

0 comments on commit 55b1297

Please sign in to comment.