Skip to content
Snippets Groups Projects
Commit 5d96f5f4 authored by PIQUEREZ Corentin's avatar PIQUEREZ Corentin
Browse files

Merge remote-tracking branch 'origin/main'

parents da496456 ce4863eb
No related branches found
No related tags found
No related merge requests found
......@@ -135,7 +135,7 @@ public class ShukanView extends JPanel
return (appliHeight);
}
/** Draws Shukan view.
/** Draws Shukan view.
*/
public void paintComponent (Graphics g)
{
......@@ -151,9 +151,9 @@ public class ShukanView extends JPanel
for (i = 0; i <= nbModules; i++)
{
int y = appliHeight - (i + 1) * 3 * textHeight + 2*textHeight;
if (i % 2 == 1)
if (i % 2 == 1)
{
g2.setColor (BACK_COLOR);
drawBox (g2,0, y, w, 3 * textHeight);
......@@ -164,19 +164,20 @@ public class ShukanView extends JPanel
drawBox (g2, 0, y, w, 3 * textHeight);
}
}
displayCalendar (g2);
}
/** Detects a zone from window coords.
*/
public boolean select (int x, int y, boolean zone)
{
// Out of the active part of the window
if (y < textHeight || y > appliHeight - 2 * textHeight) return (false);
if (x < 0 || x > appliWidth) return (false);
// Module detection
y -= textHeight;
......@@ -237,7 +238,7 @@ public class ShukanView extends JPanel
appliHeight = STD_APPLI_HEIGHT;
}
}
/** Displays the calendar grid background.
*/
private void displayCalendar (Graphics2D g2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment